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

diff --git a/src/Makefile.am b/src/Makefile.am
index 645fbed..f8c79e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,49 +1,27 @@
-AM_CFLAGS     = -Wall -Werror -Wno-unused --std=gnu99 
-bin_PROGRAMS  = aweather wsr88ddec
+SUBDIRS = gis plugins
 
-BUILT_SOURCES = marshal.c marshal.h
+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 \
-	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 = -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 = $(AM_CPPFLAGS) -DDATADIR="\"$(datadir)\""
+aweather_LDADD    = $(AM_LDADD) gis/libgis.la
 
-wsr88ddec         = wsr88ddec.c
-wsr88ddec_LDADD   = -lbz2
+wsr88ddec       = wsr88ddec.c
+wsr88ddec_LDADD = -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 -d 7
+	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
-
-memcheck:
-	G_SLICE=always-malloc                   \
-	G_DEBUG=gc-friendly,resident-modules    \
-	valgrind --leak-check=full              \
-	         --leak-resolution=high         \
-	         --num-callers=100              \
-	         --suppressions=gtk.suppression \
-	         ./aweather                     \
-	2> valgrind.out
+	LD_LIBRARY_PATH=gis/.libs ddd .libs/aweather