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

diff --git a/src/Makefile.am b/src/Makefile.am
index 1c00635..535b1d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,52 +1,37 @@
-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 $(GIS_CFLAGS)
+AM_LDFLAGS  = -Wl,--export-dynamic
 
+bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
-	marshal.c         marshal.h         \
-	aweather-gui.c    aweather-gui.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 = -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 = \
+	-DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
+	-DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
+aweather_LDADD    = $(GIS_LIBS)
 
 wsr88ddec         = wsr88ddec.c
-wsr88ddec_LDADD   = -lbz2
+wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
+
+if WIN32
+AM_LDFLAGS       += -mwindows 
+aweather_SOURCES += resource.rc
+dots              = ..
+endif
+
+.rc.o: ../data/aweather.ico
+	$(RC) -o $@ $<
 
 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 -o -d 7 -s KVNX
+	.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