X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2FMakefile.am;h=8726d838748912f2795f921481cf4d8f77d274ec;hp=ed3db864219340946ccdcd2cb895b007a7b59768;hb=HEAD;hpb=ce0016070b1fe7db3bd208d6148a776efd3f7d6e

diff --git a/src/Makefile.am b/src/Makefile.am
index ed3db86..8726d83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,10 +3,18 @@ SUBDIRS = data objects . plugins
 AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(GL_LIBS) $(SOUP_LIBS)
-AM_LDFLAGS  = -Wl,--as-needed -Wl,--no-undefined
-
-BUILT_SOURCES = grits-marshal.c grits-marshal.h
+AM_LDFLAGS  = 
 
+# System dependant flags
+if SYS_WIN
+AM_LDFLAGS += -mwindows -no-undefined
+endif
+if SYS_MAC
+AM_CFLAGS  += -ObjC
+AM_LDFLAGS += -framework AppKit
+else
+AM_LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
+endif
 
 # Headers
 grits_includedir = $(includedir)/grits
@@ -25,6 +33,9 @@ grits_include_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = grits.pc
 
+# GTK 2/3 compatability
+EXTRA_DIST = compat.h
+
 # Library
 lib_LTLIBRARIES = libgrits.la
 
@@ -39,8 +50,8 @@ libgrits_la_SOURCES = grits.h \
 	gtkgl.c         gtkgl.h         \
 	gpqueue.c       gpqueue.h
 libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
-	-DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
+	-DPKGDATADIR="\"$(DOTS)$(datadir)/$(GRITS_SUBDIR)\"" \
+	-DPLUGINSDIR="\"$(DOTS)$(libdir)/$(GRITS_SUBDIR)\""
 libgrits_la_LIBADD  = $(AM_LDADD) -lm \
 	objects/libgrits-objects.la \
 	data/libgrits-data.la
@@ -48,14 +59,6 @@ libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
 	-version-info $(LIB_VERSION)
 
 # Demo program
-if WIN32
-AM_CPPFLAGS += -DUSE_WGL
-AM_LDFLAGS  += -mwindows -no-undefined
-dots         = ..
-else
-AM_CPPFLAGS += -DUSE_GLX
-endif
-
 bin_PROGRAMS = grits-demo
 
 grits_demo_SOURCES = grits-demo.c
@@ -70,26 +73,36 @@ grits_test_LDADD   = $(AM_LDADD) libgrits.la
 tile_test_SOURCES = tile-test.c
 tile_test_LDADD   = $(AM_LDADD) libgrits.la
 
-
+# Clean
 MAINTAINERCLEANFILES = Makefile.in
 
+# Generated code 
+BUILT_SOURCES = grits-marshal.c grits-marshal.h
+
 .list.c:
 	glib-genmarshal --prefix=grits_cclosure_marshal --body   $< > $@
 .list.h:
 	glib-genmarshal --prefix=grits_cclosure_marshal --header $< > $@
 
-test: all .libs/$(GRITS_SUBDIR)
+# Debugging rules
+BUILT_SOURCES += .libs/$(GRITS_SUBDIR)
+
+.libs/$(GRITS_SUBDIR):
+	mkdir -p .libs
+	ln -sf ../plugins/.libs $@
+
+test: all
+	G_MESSAGES_DEBUG=all \
 	./grits-test
 
-gdb: all .libs/$(GRITS_SUBDIR)
-	gdb ./grits-test
+gdb: all
+	G_MESSAGES_DEBUG=all \
+	gdb ./.libs/grits-test
 
-ddd: all .libs/$(GRITS_SUBDIR)
+ddd: all
+	G_MESSAGES_DEBUG=all \
 	ddd ./grits-test
 
-.libs/$(GRITS_SUBDIR): plugins/.libs
-	ln -sf ../plugins/.libs .libs/$(GRITS_SUBDIR)
-
 memcheck: all
 	G_SLICE=always-malloc                   \
 	G_DEBUG=gc-friendly,resident-modules    \