-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\"" \
+ -DPLUGINSDIR="\"$(dots)$(libdir)/gis\""
+libgis_la_LIBADD = $(AM_LDADD) \
+ objects/libgis-objects.la \
+ data/libgis-data.la
+
+# 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)