Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 33322) +++ trunk/scconfig/hooks.c (revision 33323) @@ -364,9 +364,6 @@ if (plug_is_enabled("export_vfs_fuse")) printf("Generating fuse_includes.h (%d)\n", generr |= tmpasm("../src_plugins/export_vfs_fuse", "fuse_includes.h.in", "fuse_includes.h")); -/* remove this: */ - generr |= pup_hook_generate("../src_3rd/puplug"); - if (!generr) { printf("\n\n"); printf("=====================\n"); Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 33322) +++ trunk/src/Makefile.in (revision 33323) @@ -243,7 +243,7 @@ CQUOTE=$(ROOT)/scconfig/cquote SPHASH_PATH=$(ROOT)/src_3rd/sphash SPHASH=$(SPHASH_PATH)/sphash -PUPLUG=$(ROOT)/src_3rd/puplug/util/puplug +PUPLUG=$(ROOT)/src_3rd/librnd-local/src_3rd/puplug/util/puplug LIBMINUID_CFLAGS=@/local/pcb/CFLAGS_GENERIC@ LIBMINUID_LDFLAGS=@cc/ldflags@ GENLIST_CFLAGS=@/local/pcb/CFLAGS_GENERIC@ @@ -314,23 +314,7 @@ cd ../src_3rd/libminuid && $(MAKE) libminuid.a LIBMINUID_CFLAGS="$(LIBMINUID_CFLAGS)" LIBMINUID_LDFLAGS="$(LIBMINUID_LDFLAGS)" CC=$(CC) @] -if sys/cross -then print [@ -../src_3rd/puplug/libpuplug.a $(PUPLUG): - cd ../src_3rd/puplug && make clean - cd ../src_3rd/puplug && make util/puplug CC=$(HOSTCC) - cd ../src_3rd/puplug && rm *.o - cd ../src_3rd/puplug && make libpuplug.a CC=$(CC) -@] -else -print [@ -../src_3rd/puplug/libpuplug.a $(PUPLUG): - cd ../src_3rd/puplug && make libpuplug.a util/puplug -@] -end - -print [@ ##### module rules begin ##### @/local/pcb/RULES@ Index: trunk/src_3rd =================================================================== --- trunk/src_3rd (revision 33322) +++ trunk/src_3rd (revision 33323) Property changes on: trunk/src_3rd ___________________________________________________________________ Modified: svn:externals ## -1,6 +1,5 ## genregex svn://svn.repo.hu/genregex/trunk/src sphash svn://svn.repo.hu/sphash/trunk -puplug svn://svn.repo.hu/puplug/trunk/puplug libminuid svn://svn.repo.hu/libminuid/trunk/libminuid fast89-poly2tri svn://svn.repo.hu/fast89-poly2tri/trunk/src librnd-local svn://svn.repo.hu/librnd/trunk