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

diff --git a/src/Makefile.am b/src/Makefile.am
index 10c83f0..1c00635 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-AM_LDFLAGS    = $(RSL_LIBS) $(GTK_LIBS)
 AM_CFLAGS     = -Wall -Werror -Wno-unused --std=gnu99 
 bin_PROGRAMS  = aweather wsr88ddec
 
@@ -7,15 +6,20 @@ BUILT_SOURCES = marshal.c marshal.h
 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 \
+	gis-opengl.c      gis-opengl.h      \
+	gis-view.c        gis-view.h        \
+	gis-world.c       gis-world.h       \
 	data.c            data.h            \
 	location.c        location.h        \
+	marching.c        marching.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_CPPFLAGS = -DDATADIR="\"$(datadir)\"" \
+	$(RSL_CFLAGS) $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+aweather_LDADD    = $(RSL_LIBS) $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
 wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = -lbz2
@@ -29,7 +33,7 @@ MAINTAINERCLEANFILES = Makefile.in
 	glib-genmarshal --prefix=aweather_cclosure_marshal --header $< > $@
 
 test: all
-	./aweather -d 7
+	./aweather -o -d 7 -s KVNX
 
 gdb: all
 	gdb ./aweather