X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=535b1d052f7b3c887197800a2154cb93dbd32014;hb=5761f0ec012080b2f12c5e29a93a97b9a7ede4b4;hp=01465d4a8258279f2acc8510981fb6c36cb0b023;hpb=84c4eeaaf6a795b5b4385f2c63031acaefd70730;p=aweather

diff --git a/src/Makefile.am b/src/Makefile.am
index 01465d4..535b1d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,38 +1,37 @@
-SUBDIRS = gis plugins
+SUBDIRS = plugins
 
-AM_CFLAGS   = -Wall -Werror -Wno-unused --std=gnu99 
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
+AM_CFLAGS   = -Wall --std=gnu99 $(GIS_CFLAGS)
+AM_LDFLAGS  = -Wl,--export-dynamic
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
 	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
+aweather_CPPFLAGS = \
+	-DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
+	-DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
+aweather_LDADD    = $(GIS_LIBS)
 
-wsr88ddec       = wsr88ddec.c
-wsr88ddec_LDADD = -lbz2
+wsr88ddec         = wsr88ddec.c
+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
 
 test: all
-	LD_LIBRARY_PATH=gis/.libs .libs/aweather -o -d 7 -s KVNX
+	.libs/aweather -o -d 7
 
 gdb: all
-	LD_LIBRARY_PATH=gis/.libs gdb .libs/aweather
+	gdb .libs/aweather
 
 ddd: all
-	LD_LIBRARY_PATH=gis/.libs ddd .libs/aweather
-
-memcheck: all
-	LD_LIBRARY_PATH=gis/.libs               \
-	G_SLICE=always-malloc                   \
-	G_DEBUG=gc-friendly,resident-modules    \
-	valgrind --leak-check=full              \
-	         --leak-resolution=high         \
-	         --num-callers=100              \
-	         --suppressions=gtk.suppression \
-	         .libs/aweather                 \
-	2> valgrind.out
+	ddd .libs/aweather