X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=d5e5fac0cbc01dc8bc1e37d3966deca1e44d2eb7;hb=d01fb11de5bcf91224348bf41abb6788d0af2545;hp=18b7fba1dc450c034846f94261f4dc103e13c73a;hpb=d97d97d3896bc8299adf2e7aaa5cc38e2611f395;p=aweather

diff --git a/src/Makefile.am b/src/Makefile.am
index 18b7fba..d5e5fac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,38 +1,36 @@
-AM_LDFLAGS   = $(RSL_LIBS) $(GTK_LIBS)
-AM_CFLAGS    = -Wall -Werror -Wno-unused --std=gnu99 
-bin_PROGRAMS = aweather wsr88ddec
+SUBDIRS = gis plugins
+
+AM_CFLAGS = -Wall -Werror -Wno-unused --std=gnu99 
 
+bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
-	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
 
-# LD_LIBRARY_PATH=/usr/local/trmm/GVBOX/lib/ 
+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:
+memcheck: all
+	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