sbase

commit a85348c33b24303fdecb0b5d39a21767458c1288
parent 6d62efb57a22555a95e84866917f40012edb530a
Author: Connor Lane Smith <cls@lubutu.com>
Date:   Thu, 16 Jun 2011 01:57:01 +0100

cleanup make
Diffstat:
M
Makefile
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -93,7 +93,7 @@ sbase-box: $(SRC)
 	@echo creating box binary
 	@mkdir -p build
 	@cp -r $(HDR) util build
-	@for f in $(SRC); do sed "s/^main.*/`basename $$f .c`_main(int argc, char *argv[])/" < $$f > build/$$f; done
+	@for f in $(SRC); do sed "s/^main/`basename $$f .c`_&/" < $$f > build/$$f; done
 	@echo '#include <libgen.h>'  > build/$@.c
 	@echo '#include <stdlib.h>' >> build/$@.c
 	@echo '#include <string.h>' >> build/$@.c
@@ -101,7 +101,7 @@ sbase-box: $(SRC)
 	@for f in $(SRC); do echo "int `basename $$f .c`_main(int, char **);" >> build/sbase-box.c; done
 	@echo 'int main(int argc, char *argv[]) { char *s = basename(argv[0]); if(0);' >> build/sbase-box.c
 	@for f in $(SRC); do echo "else if(!strcmp(s, \"`basename $$f .c`\")) `basename $$f .c`_main(argc, argv);" >> build/sbase-box.c; done
-	@printf 'else eprintf("%%s: unknown program\\n", s); return EXIT_SUCCESS; }' >> build/sbase-box.c
+	@printf 'else eprintf("%%s: unknown program\\n", s); return EXIT_SUCCESS; }\n' >> build/sbase-box.c
 	@echo LD $@
 	@$(LD) -o $@ build/*.c build/util/*.c $(CFLAGS) $(LDFLAGS)
 	@rm -r build