Index: trunk/scconfig/Makefile =================================================================== --- trunk/scconfig/Makefile (revision 115) +++ trunk/scconfig/Makefile (revision 116) @@ -43,6 +43,9 @@ # Comment this line if you do not need gui (X11, toolkits) include src/gui/Makefile.plugin +# Comment this line if you do not need software utility libs (glib) +include src/sul/Makefile.plugin + # Comment this line if you do not need generator (templating) #include src/generator/Makefile.plugin @@ -50,9 +53,9 @@ include src/tmpasm/Makefile.plugin # --- you shouldn't edit the lines below --- -OBJS = $(USER_OBJS) hooks.o $(DEFAULT_OBJS) $(SCRIPT_OBJS) $(PARSER_OBJS) $(GENERATOR_OBJS) $(TMPASM_OBJS) $(C99_OBJS) $(PARSGEN_OBJS) $(MATH_OBJS) $(SOCKET_OBJS) $(USERPASS_OBJS) $(GUI_OBJS) -CFLAGS = $(USER_CFLAGS) $(DEFAULT_CFLAGS) $(SCRIPT_CFLAGS) $(PARSER_CFLAGS) $(GENERATOR_CFLAGS) $(TMPASM_CFLAGS) $(C99_CFLAGS) $(PARSGEN_CFLAGS) $(MATH_CFLAGS) $(SOCKET_CFLAGS) $(USERPASS_CFLAGS) $(GUI_CFLAGS) -Isrc/default -LDFLAGS = $(USER_LDFLAGS) $(DEFAULT_LDFLAGS) $(SCRIPT_LDFLAGS) $(PARSER_LDFLAGS) $(GENERATOR_LDFLAGS) $(TMPASM_LDFLAGS) $(C99_LDFLAGS) $(PARSGEN_LDFLAGS) $(MATH_LDFLAGS) $(SOCKET_LDFLAGS) $(USERPASS_LDFLAGS) $(GUI_LDFLAGS) +OBJS = $(USER_OBJS) hooks.o $(DEFAULT_OBJS) $(SCRIPT_OBJS) $(PARSER_OBJS) $(GENERATOR_OBJS) $(TMPASM_OBJS) $(C99_OBJS) $(PARSGEN_OBJS) $(MATH_OBJS) $(SOCKET_OBJS) $(USERPASS_OBJS) $(GUI_OBJS) $(SUL_OBJS) +CFLAGS = $(USER_CFLAGS) $(DEFAULT_CFLAGS) $(SCRIPT_CFLAGS) $(PARSER_CFLAGS) $(GENERATOR_CFLAGS) $(TMPASM_CFLAGS) $(C99_CFLAGS) $(PARSGEN_CFLAGS) $(MATH_CFLAGS) $(SOCKET_CFLAGS) $(USERPASS_CFLAGS) $(GUI_CFLAGS) $(SUL_CFLAGS) -Isrc/default +LDFLAGS = $(USER_LDFLAGS) $(DEFAULT_LDFLAGS) $(SCRIPT_LDFLAGS) $(PARSER_LDFLAGS) $(GENERATOR_LDFLAGS) $(TMPASM_LDFLAGS) $(C99_LDFLAGS) $(PARSGEN_LDFLAGS) $(MATH_LDFLAGS) $(SOCKET_LDFLAGS) $(USERPASS_LDFLAGS) $(GUI_LDFLAGS) $(SUL_LDFLAGS) configure: $(OBJS) $(CC) -o configure $(OBJS) Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 115) +++ trunk/scconfig/hooks.c (revision 116) @@ -42,6 +42,10 @@ require("fstools/mkdir", 0, 1); require("libs/gui/gtk2", 0, 1); require("libs/gui/gd", 0, 1); + + /* for the toporouter: */ + require("libs/sul/glib", 0, 1); + return 0; } @@ -59,8 +63,11 @@ { db_mkdir("/local"); + chdir(".."); + printf("Generating gts/Makefile\n", tmpasm("gts/Makefile.in", "gts/Makefile")); + #warning TODO: need a better include search path mechanism - chdir("../src"); + chdir("src"); printf("Generating pcb/Makefile\n", tmpasm("Makefile.in", "Makefile")); return 0; }