X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=9f317e6cf113f04eced9b1deefc37b18a2d058f4;hb=d180b4f206c4fc1d41cfa36d8a2c44a5dc04cc63;hp=705df0e19f69ca36897d94b0ad98b5c0246f2ffe;hpb=55d69c616a9f4f3bae23045f1174047003e2e1d4;p=aweather

diff --git a/src/Makefile.am b/src/Makefile.am
index 705df0e..9f317e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,45 +1,36 @@
-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   \
-	aweather-plugin.c aweather-plugin.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
+	LD_LIBRARY_PATH=gis/.libs .libs/aweather -o -d 7 -s KVNX
 
 gdb: all
-	gdb ./aweather
+	LD_LIBRARY_PATH=gis/.libs gdb .libs/aweather
 
 ddd: all
-	ddd ./aweather
+	LD_LIBRARY_PATH=gis/.libs ddd .libs/aweather
 
 memcheck:
+	LD_LIBRARY_PATH=gis/.libs/               \
 	G_SLICE=always-malloc                   \
 	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
+	         .libs/aweather                 \
+	2> valgrind.out