X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/f31590988781d77ff5249987801d03a986368ca2..69c350c69e70bddb040dfc5d90b0368376a6389e:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index fdd0dcd..b9d186d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,24 +1,45 @@
 #YACCFLAGS += -d -t
-YFLAGS += -d -t
-SUBDIRS =
+YFLAGS = -d -t
+SUBDIRS = .
 
-INCLUDES = @GLIB_CFLAGS@ -I$(includedir)
+CFLAGS = @CFLAGS@ \
+	-Wall			\
+	-Wpointer-arith		\
+	-Wmissing-prototypes	\
+	-Wmissing-declarations
+
+DEFS = @DEFS@ \
+	-DPKGDATADIR=\"$(pkgdatadir)\"
+
+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@
-EXTRA_PROGRAMS = gob
+EXTRA_PROGRAMS = gob2
+
+BUILT_SOURCES = parse.h parse.c lexer.c
 
-gob_SOURCES = 	\
+gob2_SOURCES = 	\
 	main.c		\
 	main.h		\
-	tree.c		\
-	tree.h		\
+	treefuncs.c	\
+	treefuncs.h	\
 	out.c		\
 	out.h		\
+	util.c		\
+	util.h		\
+	checks.c	\
+	checks.h	\
 	parse.y		\
 	lexer.l
 
-gob_LDADD = \
+gob2_LDADD = \
 	-lm \
 	$(GLIB_LIBS) \
 	@LEXLIB@
@@ -26,19 +47,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
+EXTRA_DIST = $(BUILT_SOURCES) test.gob generate_treefuncs.pl treefuncs.def
 
-parse.h: parse.y
+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 -Wall `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
+
+# 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
 
-gtk-weird-button.c gtk-weird-button.h: test.gob gob
-	./gob test.gob
+test-object.cc: test.gob gob2
+	./gob2 --for-cpp test.gob