Index: trunk/scconfig/Makefile
===================================================================
--- trunk/scconfig/Makefile	(revision 110)
+++ trunk/scconfig/Makefile	(revision 111)
@@ -44,12 +44,15 @@
 include src/gui/Makefile.plugin
 
 #  Comment this line if you do not need generator (templating)
-include src/generator/Makefile.plugin
+#include src/generator/Makefile.plugin
 
+#  Comment this line if you do not need tmpasm (templating); conflicts with generator
+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) $(C99_OBJS) $(PARSGEN_OBJS) $(MATH_OBJS) $(SOCKET_OBJS) $(USERPASS_OBJS) $(GUI_OBJS)
-CFLAGS = $(USER_CFLAGS) $(DEFAULT_CFLAGS) $(SCRIPT_CFLAGS) $(PARSER_CFLAGS) $(GENERATOR_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) $(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)
+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)
 
 configure: $(OBJS)
 	$(CC) -o configure $(OBJS)
Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 110)
+++ trunk/scconfig/hooks.c	(revision 111)
@@ -2,7 +2,7 @@
 #include "arg.h"
 #include "log.h"
 #include "dep.h"
-#include "generator.h"
+#include "tmpasm.h"
 
 /* Runs when a custom command line argument is found
  returns true if no furhter argument processing should be done */
@@ -61,7 +61,7 @@
 
 #warning TODO: need a better include search path mechanism
 	chdir("../src");
-	printf("Generating pcb/Makefile\n", generate("Makefile.in", "Makefile"));
+	printf("Generating pcb/Makefile\n", tmpasm("Makefile.in", "Makefile"));
 	return 0;
 }