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

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f317e6..210cfe0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,36 +1,102 @@
-SUBDIRS = gis plugins
+SUBDIRS = data objects . plugins
 
-AM_CFLAGS = -Wall -Werror -Wno-unused --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
 
-bin_PROGRAMS = aweather wsr88ddec
-aweather_SOURCES  = main.c \
-	aweather-gui.c      aweather-gui.h \
-	aweather-location.c aweather-location.h
-aweather_CPPFLAGS = -DDATADIR="\"$(datadir)\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-aweather_LDADD    = gis/libgis.la $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+BUILT_SOURCES = gis-marshal.c gis-marshal.h
+
+
+# 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     \
+	roam.h
+
+# 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    \
+	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) \
+	-version-info $(LIB_VERSION)
+
+# 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
+noinst_PROGRAMS = gis-test tile-test
+
+gis_test_SOURCES = gis-test.c
+gis_test_LDADD   = $(AM_LDADD) libgis.la
+gis_test_LDFLAGS  = $(BINLDFLAGS)
+
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgis.la
+tile_test_LDFLAGS = $(BINLDFLAGS)
 
-wsr88ddec         = wsr88ddec.c
-wsr88ddec_LDFLAGS = -lbz2
 
-CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in
 
-test: all
-	LD_LIBRARY_PATH=gis/.libs .libs/aweather -o -d 7 -s KVNX
+.list.c:
+	glib-genmarshal --prefix=gis_cclosure_marshal --body   $< > $@
+.list.h:
+	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
+
+test: all .libs/$(GIS_SUBDIR)
+	./gis-test
+
+gdb: all .libs/$(GIS_SUBDIR)
+	gdb ./gis-test
 
-gdb: all
-	LD_LIBRARY_PATH=gis/.libs gdb .libs/aweather
+ddd: all .libs/$(GIS_SUBDIR)
+	ddd ./gis-test
 
-ddd: all
-	LD_LIBRARY_PATH=gis/.libs ddd .libs/aweather
+.libs/$(GIS_SUBDIR): plugins/.libs
+	ln -sf ../plugins/.libs .libs/$(GIS_SUBDIR)
 
-memcheck:
-	LD_LIBRARY_PATH=gis/.libs/               \
+memcheck: all
 	G_SLICE=always-malloc                   \
 	G_DEBUG=gc-friendly,resident-modules    \
-	valgrind --leak-check=full              \
+	valgrind --track-origins=yes            \
+	         --leak-check=full              \
 	         --leak-resolution=high         \
-	         --num-callers=100              \
+	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
-	         .libs/aweather                 \
+	         ./gis-test                     \
 	2> valgrind.out