X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2FMakefile.am;h=c37ed21a50f974a63e36dcb679fedd0d47323851;hp=9f317e6cf113f04eced9b1deefc37b18a2d058f4;hb=5d7ed88c487a02cc335dcd38260681cd3ce145a8;hpb=d180b4f206c4fc1d41cfa36d8a2c44a5dc04cc63

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f317e6..c37ed21 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,36 +1,73 @@
-SUBDIRS = gis plugins
+SUBDIRS = plugins
 
-AM_CFLAGS = -Wall -Werror -Wno-unused --std=gnu99 
+AM_CFLAGS   = -Wall --std=gnu99 $(GRITS_CFLAGS)
+AM_LDFLAGS  = -Wl,--export-dynamic -Wl,--no-undefined
+
+if !SYS_MAC
+AM_LDFLAGS += -Wl,--as-needed 
+endif
+
+EXTRA_DIST  = compat.h
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
 	aweather-gui.c      aweather-gui.h \
 	aweather-location.c aweather-location.h
-aweather_CPPFLAGS = -DDATADIR="\"$(datadir)\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-aweather_LDADD    = gis/libgis.la $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+aweather_CPPFLAGS = \
+	-DHTMLDIR="\"$(DOTS)$(htmldir)\"" \
+	-DICONDIR="\"$(DOTS)$(datadir)/icons\"" \
+	-DPKGDATADIR="\"$(DOTS)$(pkgdatadir)\"" \
+	-DPLUGINSDIR="\"$(DOTS)$(pkglibdir)\""
+aweather_LDADD    = $(GRITS_LIBS)
 
 wsr88ddec         = wsr88ddec.c
-wsr88ddec_LDFLAGS = -lbz2
+wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
+
+if SYS_WIN
+wsr88ddec_LDFLAGS     = -mwindows
+
+aweather_SOURCES     += resource.rc
+aweather_LDFLAGS      = -mwindows
+aweather_CPPFLAGS    += -I$(top_srcdir)/lib
+
+bin_PROGRAMS         += aweather-dbg
+aweather_dbg_SOURCES  = $(aweather_SOURCES)
+aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
+aweather_dbg_LDADD    = $(aweather_LDADD)
+endif
+
+if SYS_MAC
+aweather_CPPFLAGS    += $(MAC_CFLAGS)
+aweather_LDADD       += $(MAC_LIBS)
+endif
+
+.rc.o: ../data/icons/48x48/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 5
+#.libs/aweather -o -d 7 -s KOUN -t '2011-02-01 10:01Z'
+#.libs/aweather -o -d 7 -s KLSX -t '2010-12-31 17:56Z'
+#.libs/aweather -o -d 7 -s KDGX -t '2010-12-31 23:10Z'
+#.libs/aweather -o -d 7 -s KDGX -t '1999-05-03 23:51Z'
 
 gdb: all
-	LD_LIBRARY_PATH=gis/.libs gdb .libs/aweather
+	gdb .libs/aweather
 
 ddd: all
-	LD_LIBRARY_PATH=gis/.libs ddd .libs/aweather
+	ddd .libs/aweather
 
-memcheck:
-	LD_LIBRARY_PATH=gis/.libs/               \
+memcheck: all
 	G_SLICE=always-malloc                   \
 	G_DEBUG=gc-friendly,resident-modules    \
-	valgrind --leak-check=full              \
+	valgrind --track-origins=yes            \
+	         --leak-check=full              \
 	         --leak-resolution=high         \
-	         --num-callers=100              \
+	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
+	         --suppressions=/usr/lib/valgrind/default.supp \
 	         .libs/aweather                 \
 	2> valgrind.out