X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/486240dc4c5d57b0afaddba60d87fe375112bed5..4d534c82fb65897999ade6867534ab952a9bc019:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1c846fd..51e76ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,35 @@
 #YACCFLAGS += -d -t
-YFLAGS += -d -t
-SUBDIRS =
+AM_YFLAGS = -d -t
+SUBDIRS = .
 
-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
 
-INCLUDES = @GLIB_CFLAGS@ -I$(includedir)
+DEFS = @DEFS@ \
+	-DPKGDATADIR=\"$(pkgdatadir)\"
 
-bin_PROGRAMS = @DOINSTGOB@
+INCLUDES = \
+	$(GLIB_CFLAGS)		\
+	-I$(top_builddir)	\
+	-I$(top_builddir)/src	\
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/src	\
+	-I$(includedir)
+
+if NOINSTGOB
 noinst_PROGRAMS = @NOINSTGOB@
-EXTRA_PROGRAMS = gob
+else
+bin_PROGRAMS = @INSTGOB@
+endif
+EXTRA_PROGRAMS = gob2
+
+BUILT_SOURCES = parse.h parse.c lexer.c
 
-gob_SOURCES = 	\
+gob2_SOURCES = 	\
 	main.c		\
 	main.h		\
 	treefuncs.c	\
@@ -24,7 +43,7 @@ gob_SOURCES = 	\
 	parse.y		\
 	lexer.l
 
-gob_LDADD = \
+gob2_LDADD = \
 	-lm \
 	$(GLIB_LIBS) \
 	@LEXLIB@
@@ -32,27 +51,25 @@ gob_LDADD = \
 # we might want popt back in the future
 #	@POPT_LIB@
 
-BUILT_SOURCES = parse.h parse.c lexer.c
-
-CLEANFILES += $(BUILT_SOURCES) gtk-weird-button.* gtk-weird-button-private.h
+CLEANFILES = @CLEANFILES@ $(BUILT_SOURCES) test-object.* test-object-private.h
 
-EXTRA_DIST = test.gob generate_treefuncs.pl treefuncs.def
+EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def
 
-parse.h: 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: gtk-weird-button.c gtk-weird-button.h
-	$(CC) -g -Wall `gtk-config --cflags` -c gtk-weird-button.c
+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
 
-gtk-weird-button.c gtk-weird-button.h: test.gob gob
-	./gob test.gob
+test-object.c test-object.h: test.gob gob2
+	./gob2 test.gob
 
 # can't depend on the header file as that would break the above rule
 # since it's just for testing, who cares
-testcpp: gtk-weird-button.cc
-	g++ -g -Wall `gtk-config --cflags` -c gtk-weird-button.cc
+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
 
-gtk-weird-button.cc: test.gob gob
-	./gob --for-cpp test.gob
+test-object.cc: test.gob gob2
+	./gob2 --for-cpp test.gob