-bin_PROGRAMS = aweather wsr88ddec
-aweather_SOURCES = main.c \
- aweather-gui.c aweather-gui.h \
- aweather-location.c aweather-location.h
-aweather_CPPFLAGS = $(AM_CPPFLAGS) -DDATADIR="\"$(datadir)\""
-aweather_LDADD = $(AM_LDADD) gis/libgis.la
+# Library
+BUILT_SOURCES = gis-marshal.c gis-marshal.h
+lib_LTLIBRARIES = libgis.la
+gis_includedir = $(includedir)/gis
+gis_include_HEADERS = \
+ gis.h \
+ gis-world.h \
+ gis-view.h \
+ gis-prefs.h \
+ gis-opengl.h \
+ gis-plugin.h \
+ gis-data.h \
+ gpqueue.h \
+ roam.h \
+ wms.h
+libgis_la_SOURCES = \
+ gis-world.c gis-world.h \
+ gis-view.c gis-view.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-data.c gis-data.h \
+ roam.c roam.h \
+ wms.c wms.h \
+ gpqueue.c gpqueue.h
+libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
+ -DDATADIR="\"$(datadir)\"" -DPLUGINDIR="\"$(libdir)/gis\""
+libgis_la_LIBADD = $(AM_LDADD)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgis.pc
+
+# Test programs
+bin_PROGRAMS = gis_test wms_test