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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a8b829..291dfb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,13 @@
 #YACCFLAGS += -d -t
-YFLAGS = -d -t
-SUBDIRS =
+AM_YFLAGS = -d -t
+SUBDIRS = .
 
-CFLAGS = @CFLAGS@ \
-	-Wall			\
-	-Wpointer-arith		\
-	-Wmissing-prototypes	\
-	-Wmissing-declarations
+#GCC specific, should not be in distributed files
+#AM_CFLAGS = \
+#	-Wall			\
+#	-Wpointer-arith		\
+#	-Wmissing-prototypes	\
+#	-Wmissing-declarations
 
 DEFS = @DEFS@ \
 	-DPKGDATADIR=\"$(pkgdatadir)\"
@@ -14,11 +15,16 @@ DEFS = @DEFS@ \
 INCLUDES = \
 	$(GLIB_CFLAGS)		\
 	-I$(top_builddir)	\
+	-I$(top_builddir)/src	\
 	-I$(top_srcdir)		\
+	-I$(top_srcdir)/src	\
 	-I$(includedir)
 
-bin_PROGRAMS = @DOINSTGOB@
-noinst_PROGRAMS = @NOINSTGOB@
+if NOINSTGOB
+noinst_PROGRAMS = gob2
+else
+bin_PROGRAMS = gob2
+endif
 EXTRA_PROGRAMS = gob2
 
 BUILT_SOURCES = parse.h parse.c lexer.c
@@ -47,15 +53,15 @@ gob2_LDADD = \
 
 CLEANFILES = @CLEANFILES@ $(BUILT_SOURCES) test-object.* test-object-private.h
 
-EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def
+EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def str.gob str_test.c Makefile.str
 
-parse.h parse.c: parse.y
-	$(YACC) $(YFLAGS) $<
-	test -f y.tab.c && mv -f y.tab.c parse.c
-	test -f y.tab.h && mv -f y.tab.h parse.h
+# parse.h parse.c: parse.y
+# 	$(YACC) $(YFLAGS) $<
+# 	test -f y.tab.c && mv -f y.tab.c parse.c
+# 	test -f y.tab.h && mv -f y.tab.h parse.h
 
 test: test-object.c test-object.h
-	$(CC) -g -Wall `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
@@ -63,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 -Wall `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