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

diff --git a/src/Makefile.am b/src/Makefile.am
index fad1033..18976bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,22 @@
-AM_LDFLAGS    = $(RSL_LIBS) $(GTK_LIBS)
-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  \
-	data.c           data.h           \
-	location.c       location.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 = $(RSL_CFLAGS) $(GTK_CFLAGS) -DDATADIR="\"$(datadir)\"" 
+	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
 
-.list.c:
-	glib-genmarshal --prefix=aweather_cclosure_marshal --body   $< > $@
-.list.h:
-	glib-genmarshal --prefix=aweather_cclosure_marshal --header $< > $@
+CLEANFILES = gmon.out valgrind.out
+MAINTAINERCLEANFILES = Makefile.in
 
 test: all
-	./aweather
+	./aweather -o -d 7 -s KVNX
 
 gdb: all
 	gdb ./aweather
@@ -38,7 +29,7 @@ memcheck:
 	G_DEBUG=gc-friendly,resident-modules    \
 	valgrind --leak-check=full              \
 	         --leak-resolution=high         \
-	         --num-callers=50               \
+	         --num-callers=100              \
 	         --suppressions=gtk.suppression \
 	         ./aweather                     \
-	2> memcheck.log
+	2> valgrind.out