X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/714b58ab4606ed4d40cec3702cb378938f8c883f..7231d76fbf4ae0b501af648e1216b88714aa7353:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ffe9113..769bfc8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,11 +8,11 @@ INCLUDES = @GLIB_CFLAGS@ -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		\
 	treefuncs.c	\
@@ -26,7 +26,7 @@ gob_SOURCES = 	\
 	parse.y		\
 	lexer.l
 
-gob_LDADD = \
+gob2_LDADD = \
 	-lm \
 	$(GLIB_LIBS) \
 	@LEXLIB@
@@ -34,25 +34,25 @@ gob_LDADD = \
 # we might want popt back in the future
 #	@POPT_LIB@
 
-CLEANFILES += $(BUILT_SOURCES) gtk-weird-button.* gtk-weird-button-private.h
+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.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` -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 -Wall `pkg-config --cflags gobject-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