X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2FMakefile.am;h=c955106bbb16b09f19d10b6ac3e9c3e49c5e6187;hp=10c83f051789f8f84f4f32a12b604ed1b45ad131;hb=417339b0711d05eb6df2a9c5a9b10551f3515edd;hpb=5e979044ddae3f2e9d31f480dd103bfb0fa7103b

diff --git a/src/Makefile.am b/src/Makefile.am
index 10c83f0..c955106 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,48 +1,27 @@
-AM_LDFLAGS    = $(RSL_LIBS) $(GTK_LIBS)
-AM_CFLAGS     = -Wall -Werror -Wno-unused --std=gnu99 
-bin_PROGRAMS  = aweather wsr88ddec
+SUBDIRS = plugins
 
-BUILT_SOURCES = marshal.c marshal.h
+AM_CFLAGS   = -Wall --std=gnu99 
+AM_CPPFLAGS = $(GIS_CFLAGS)
+LIBS        = $(GIS_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 = $(RSL_CFLAGS) $(GTK_CFLAGS) -DDATADIR="\"$(datadir)\"" 
+	aweather-gui.c      aweather-gui.h \
+	aweather-location.c aweather-location.h
+aweather_CPPFLAGS = $(AM_CPPFLAGS) \
+		    -DPKGDATADIR="\"$(pkgdatadir)\"" -DPLUGINSDIR="\"$(pkglibdir)\""
 
-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
+	.libs/aweather -o -d 7
 
 gdb: all
-	gdb ./aweather
+	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
+	ddd .libs/aweather