X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/3e833eea9cb9822f04c639e143212c4b6f7940d4..2cd951c678998b2b0230c8eb25717ecf0f1dd2db:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 585fe09..291dfb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,9 @@ INCLUDES = \
 	-I$(includedir)
 
 if NOINSTGOB
-noinst_PROGRAMS = @NOINSTGOB@
+noinst_PROGRAMS = gob2
 else
-bin_PROGRAMS = @INSTGOB@
+bin_PROGRAMS = gob2
 endif
 EXTRA_PROGRAMS = gob2
 
@@ -61,7 +61,7 @@ EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def str.g
 # 	test -f y.tab.h && mv -f y.tab.h parse.h
 
 test: test-object.c test-object.h
-	$(CC) -g -O -W -Wall -Wunused -Wuninitialized -Wdeclaration-after-statement -Wshadow -Wwrite-strings -Wunreachable-code -Wbad-function-cast -pedantic `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c
+	$(CC) -g -O -W -Wall -Wunused -Wuninitialized -Wdeclaration-after-statement -Wshadow -Wwrite-strings -Wunreachable-code -Wbad-function-cast `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.c
 
 test-object.c test-object.h: test.gob gob2
 	./gob2 test.gob
@@ -69,7 +69,7 @@ test-object.c test-object.h: test.gob gob2
 # can't depend on the header file as that would break the above rule
 # since it's just for testing, who cares
 testcpp: test-object.cc
-	g++ -g -O -W -Wall -Wunused -Wuninitialized  -Wwrite-strings -Wunreachable-code -pedantic `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc
+	g++ -g -O -W -Wall -Wunused -Wuninitialized  -Wwrite-strings -Wunreachable-code `pkg-config --cflags gobject-2.0 gtk+-2.0` -c test-object.cc
 
 test-object.cc: test.gob gob2
 	./gob2 --for-cpp test.gob