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

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f317e6..e9b536d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,36 +1,106 @@
-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) $(GL_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(GL_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 = grits-marshal.c grits-marshal.h
+
+
+# Headers
+grits_includedir = $(includedir)/grits
+grits_include_HEADERS = \
+	grits.h         \
+	grits-viewer.h  \
+	grits-prefs.h   \
+	grits-opengl.h  \
+	grits-plugin.h  \
+	grits-util.h    \
+	gpqueue.h       \
+	roam.h
+
+# Pkg-config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = grits.pc
+
+# Library
+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) \
+	objects/libgrits-objects.la \
+	data/libgrits-data.la
+libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
+	-version-info $(LIB_VERSION)
+
+# Demo program
+if WIN32
+AM_CPPFLAGS += -DUSE_WGL
+AM_LDFLAGS  += -mwindows
+dots         = ..
+else
+AM_CPPFLAGS += -DUSE_GLX
+BINLDFLAGS   = -static
+endif
+
+bin_PROGRAMS = grits-demo
+
+grits_demo_SOURCES = grits-demo.c
+grits_demo_LDADD   = $(AM_LDADD) libgrits.la
+grits_demo_LDFLAGS = $(BINLDFLAGS)
+
+# Test programs
+noinst_PROGRAMS = grits-test tile-test
+
+grits_test_SOURCES = grits-test.c
+grits_test_LDADD   = $(AM_LDADD) libgrits.la
+grits_test_LDFLAGS = $(BINLDFLAGS)
+
+tile_test_SOURCES = tile-test.c
+tile_test_LDADD   = $(AM_LDADD) libgrits.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=grits_cclosure_marshal --body   $< > $@
+.list.h:
+	glib-genmarshal --prefix=grits_cclosure_marshal --header $< > $@
+
+test: all .libs/$(GRITS_SUBDIR)
+	./grits-test
+
+gdb: all .libs/$(GRITS_SUBDIR)
+	gdb ./grits-test
 
-gdb: all
-	LD_LIBRARY_PATH=gis/.libs gdb .libs/aweather
+ddd: all .libs/$(GRITS_SUBDIR)
+	ddd ./grits-test
 
-ddd: all
-	LD_LIBRARY_PATH=gis/.libs ddd .libs/aweather
+.libs/$(GRITS_SUBDIR): plugins/.libs
+	ln -sf ../plugins/.libs .libs/$(GRITS_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                 \
+	         --suppressions=/usr/lib/valgrind/default.supp \
+	         ./grits-test                   \
 	2> valgrind.out