X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=f8c79e8a9b0ad3d64d41927b9550fb308c98d430;hb=d706e67c559f82a5cd2300b35b23812fd08832c5;hp=a47ed55150534704b6832b5d0216c29fd18ac903;hpb=47c93b9c86bcb79df6f28a3c253be9b9644a1c34;p=grits

diff --git a/src/Makefile.am b/src/Makefile.am
index a47ed55..f8c79e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,27 @@
-AM_CPPFLAGS  = -DDATADIR="\"$(datadir)\"" $(RSL_CFLAGS) $(GTK_CFLAGS) $(CURL_CFLAGS) 
-AM_CFLAGS    = -Wall -Werror -Wno-unused --std=gnu99 
-AM_LDFLAGS   = -Wl,--export-dynamic
-bin_PROGRAMS = aweather wsr88ddec
+SUBDIRS = gis plugins
+
+AM_CFLAGS   = -Wall --std=gnu99 
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
 
+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_LDADD    = $(RSL_LIBS) $(GTK_LIBS) $(CURL_LIBS)
+	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
 
-wsr88ddec         = wsr88ddec.c
-wsr88ddec_LDADD   = -lbz2
+wsr88ddec       = wsr88ddec.c
+wsr88ddec_LDADD = -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