X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2FMakefile.am;h=fd2fceb520e65316b3680c6a058bf924ce411a42;hp=210cfe05816b1c0d070a1801bb5b05558aa18b79;hb=8bbd94522aa48d4ae72b1034cf7a17e29f98f329;hpb=c2e55f28ba50e19fbf792a27009778e9dcca6fbb

diff --git a/src/Makefile.am b/src/Makefile.am
index 210cfe0..fd2fceb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,94 +1,98 @@
 SUBDIRS = data objects . plugins
 
 AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
-AM_LDFLAGS  = --as-needed -no-undefined
-
-BUILT_SOURCES = gis-marshal.c gis-marshal.h
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(GL_LIBS) $(SOUP_LIBS)
+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
-gis_includedir = $(includedir)/gis
-gis_include_HEADERS = \
-	gis.h         \
-	gis-viewer.h  \
-	gis-prefs.h   \
-	gis-opengl.h  \
-	gis-plugin.h  \
-	gis-util.h    \
-	gpqueue.h     \
+grits_includedir = $(includedir)/grits
+grits_include_HEADERS = \
+	grits.h         \
+	grits-viewer.h  \
+	grits-prefs.h   \
+	grits-opengl.h  \
+	grits-plugin.h  \
+	grits-util.h    \
+	gtkgl.h         \
+	gpqueue.h       \
 	roam.h
 
 # Pkg-config
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgis.pc
+pkgconfig_DATA = grits.pc
 
 # Library
-lib_LTLIBRARIES = libgis.la
-
-libgis_la_SOURCES = gis.h \
-	gis-viewer.c  gis-viewer.h  \
-	gis-prefs.c   gis-prefs.h   \
-	gis-opengl.c  gis-opengl.h  \
-	gis-plugin.c  gis-plugin.h  \
-	gis-marshal.c gis-marshal.h \
-	gis-util.c    gis-util.h    \
-	roam.c        roam.h        \
-	gpqueue.c     gpqueue.h
-libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPKGDATADIR="\"$(dots)$(datadir)/$(GIS_SUBDIR)\"" \
-	-DPLUGINSDIR="\"$(dots)$(libdir)/$(GIS_SUBDIR)\""
-libgis_la_LIBADD  = $(AM_LDADD) \
-	objects/libgis-objects.la \
-	data/libgis-data.la
-libgis_la_LDFLAGS = $(AM_LDFLAGS) \
+lib_LTLIBRARIES = libgrits.la
+
+libgrits_la_SOURCES = grits.h \
+	grits-viewer.c  grits-viewer.h  \
+	grits-prefs.c   grits-prefs.h   \
+	grits-opengl.c  grits-opengl.h  \
+	grits-plugin.c  grits-plugin.h  \
+	grits-marshal.c grits-marshal.h \
+	grits-util.c    grits-util.h    \
+	roam.c          roam.h          \
+	gtkgl.c         gtkgl.h         \
+	gpqueue.c       gpqueue.h
+libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
+	-DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
+	-DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
+libgrits_la_LIBADD  = $(AM_LDADD) -lm \
+	objects/libgrits-objects.la \
+	data/libgrits-data.la
+libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
 	-version-info $(LIB_VERSION)
 
 # Demo program
-if WIN32
-AM_LDFLAGS += -mwindows
-dots        = ..
-else
-BINLDFLAGS  = -static
-endif
-
-bin_PROGRAMS = gis-demo
+bin_PROGRAMS = grits-demo
 
-gis_demo_SOURCES  = gis-demo.c
-gis_demo_LDADD    = $(AM_LDADD) libgis.la
-gis_demo_LDFLAGS  = $(BINLDFLAGS)
+grits_demo_SOURCES = grits-demo.c
+grits_demo_LDADD   = $(AM_LDADD) libgrits.la
 
 # Test programs
-noinst_PROGRAMS = gis-test tile-test
+noinst_PROGRAMS = grits-test tile-test
 
-gis_test_SOURCES = gis-test.c
-gis_test_LDADD   = $(AM_LDADD) libgis.la
-gis_test_LDFLAGS  = $(BINLDFLAGS)
+grits_test_SOURCES = grits-test.c
+grits_test_LDADD   = $(AM_LDADD) libgrits.la
 
 tile_test_SOURCES = tile-test.c
-tile_test_LDADD   = $(AM_LDADD) libgis.la
-tile_test_LDFLAGS = $(BINLDFLAGS)
-
+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=gis_cclosure_marshal --body   $< > $@
+	glib-genmarshal --prefix=grits_cclosure_marshal --body   $< > $@
 .list.h:
-	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
+	glib-genmarshal --prefix=grits_cclosure_marshal --header $< > $@
 
-test: all .libs/$(GIS_SUBDIR)
-	./gis-test
+# Debugging rules
+test: all .libs/$(GRITS_SUBDIR)
+	./grits-test
 
-gdb: all .libs/$(GIS_SUBDIR)
-	gdb ./gis-test
+gdb: all .libs/$(GRITS_SUBDIR)
+	gdb ./grits-test
 
-ddd: all .libs/$(GIS_SUBDIR)
-	ddd ./gis-test
+ddd: all .libs/$(GRITS_SUBDIR)
+	ddd ./grits-test
 
-.libs/$(GIS_SUBDIR): plugins/.libs
-	ln -sf ../plugins/.libs .libs/$(GIS_SUBDIR)
+.libs/$(GRITS_SUBDIR): plugins/.libs
+	ln -sf ../plugins/.libs .libs/$(GRITS_SUBDIR)
 
 memcheck: all
 	G_SLICE=always-malloc                   \
@@ -98,5 +102,6 @@ memcheck: all
 	         --leak-resolution=high         \
 	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
-	         ./gis-test                     \
+	         --suppressions=/usr/lib/valgrind/default.supp \
+	         .libs/grits-test               \
 	2> valgrind.out