X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=18976bc36dac8d84f8eb08932cbe2116f5459888;hb=ca898105ec4018b54ac2f6f1327200624169103e;hp=620cdcb18f280288915bb1a3f8238f3c0343030d;hpb=aba05890085cec97c631b5b8a25fd04c960ec203;p=aweather

diff --git a/src/Makefile.am b/src/Makefile.am
index 620cdcb..18976bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,35 +1,20 @@
-AM_CFLAGS     = -Wall -Werror -Wno-unused --std=gnu99 
-bin_PROGRAMS  = aweather wsr88ddec
+SUBDIRS = gis plugins
 
-BUILT_SOURCES = marshal.c marshal.h
+AM_CFLAGS = -Wall -Werror -Wno-unused --std=gnu99 
 
+bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
-	marshal.c         marshal.h         \
-	aweather-gui.c    aweather-gui.h    \
-	aweather-view.c   aweather-view.h   \
-	aweather-plugin.c aweather-plugin.h \
-	data.c            data.h            \
-	location.c        location.h        \
-	marching.c        marching.h        \
-	plugin-radar.c    plugin-radar.h    \
-	plugin-radar-colormap.c             \
-	plugin-ridge.c    plugin-ridge.h    \
-	plugin-example.c  plugin-example.h
-aweather_CPPFLAGS = -DDATADIR="\"$(datadir)\"" \
-	$(RSL_CFLAGS) $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-aweather_LDADD    = $(RSL_LIBS) $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+	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)
 
 wsr88ddec         = wsr88ddec.c
-wsr88ddec_LDADD   = -lbz2
+wsr88ddec_LDFLAGS = -lbz2
 
 CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in
 
-.list.c:
-	glib-genmarshal --prefix=aweather_cclosure_marshal --body   $< > $@
-.list.h:
-	glib-genmarshal --prefix=aweather_cclosure_marshal --header $< > $@
-
 test: all
 	./aweather -o -d 7 -s KVNX