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

diff --git a/src/Makefile.am b/src/Makefile.am
index 10e650b..210cfe0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,14 @@
-SUBDIRS = . plugins
+SUBDIRS = data objects . plugins
 
-AM_CFLAGS   = -Wall --std=gnu99
+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
 
-# Library
 BUILT_SOURCES = gis-marshal.c gis-marshal.h
-lib_LTLIBRARIES  = libgis.la
+
+
+# Headers
 gis_includedir = $(includedir)/gis
 gis_include_HEADERS = \
 	gis.h         \
@@ -14,43 +16,60 @@ gis_include_HEADERS = \
 	gis-prefs.h   \
 	gis-opengl.h  \
 	gis-plugin.h  \
-	gis-object.h  \
 	gis-util.h    \
-	gis-data.h    \
-	gis-tile.h    \
-	gis-wms.h     \
 	gpqueue.h     \
 	roam.h
-libgis_la_SOURCES = \
+
+# Pkg-config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgis.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    \
-	gis-data.c    gis-data.h    \
-	gis-tile.c    gis-tile.h    \
-	gis-wms.c     gis-wms.h     \
-	gis-object.c  gis-object.h  \
 	roam.c        roam.h        \
 	gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPKGDATADIR="\"$(datadir)/gis\"" -DPLUGINSDIR="\"$(libdir)/gis\""
-libgis_la_LIBADD = $(AM_LDADD)
-libgis_la_LDFLAGS = -no-undefined
+	-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) \
+	-version-info $(LIB_VERSION)
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgis.pc
+# Demo program
+if WIN32
+AM_LDFLAGS += -mwindows
+dots        = ..
+else
+BINLDFLAGS  = -static
+endif
+
+bin_PROGRAMS = gis-demo
+
+gis_demo_SOURCES  = gis-demo.c
+gis_demo_LDADD    = $(AM_LDADD) libgis.la
+gis_demo_LDFLAGS  = $(BINLDFLAGS)
 
 # Test programs
-bin_PROGRAMS = gis_test wms_test
+noinst_PROGRAMS = gis-test tile-test
+
+gis_test_SOURCES = gis-test.c
+gis_test_LDADD   = $(AM_LDADD) libgis.la
+gis_test_LDFLAGS  = $(BINLDFLAGS)
 
-gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDADD    = $(AM_LDADD) libgis.la
-gis_test_LDFLAGS  = -static
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgis.la
+tile_test_LDFLAGS = $(BINLDFLAGS)
 
-wms_test_SOURCES  = wms_test.c gis-util.c gis-util.h gis-wms.c gis-wms.h gis-tile.c gis-tile.h
-wms_test_LDADD    = $(AM_LDADD)
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -59,17 +78,17 @@ MAINTAINERCLEANFILES = Makefile.in
 .list.h:
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
-test: all .libs/gis
-	./gis_test
+test: all .libs/$(GIS_SUBDIR)
+	./gis-test
 
-gdb: all .libs/gis
-	gdb ./gis_test
+gdb: all .libs/$(GIS_SUBDIR)
+	gdb ./gis-test
 
-ddd: all .libs/gis
-	ddd ./gis_test
+ddd: all .libs/$(GIS_SUBDIR)
+	ddd ./gis-test
 
-.libs/gis: plugins/.libs
-	ln -sf ../plugins/.libs .libs/gis
+.libs/$(GIS_SUBDIR): plugins/.libs
+	ln -sf ../plugins/.libs .libs/$(GIS_SUBDIR)
 
 memcheck: all
 	G_SLICE=always-malloc                   \
@@ -79,5 +98,5 @@ memcheck: all
 	         --leak-resolution=high         \
 	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
-	         ./gis_test                     \
+	         ./gis-test                     \
 	2> valgrind.out