X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2FMakefile.am;h=6ac5415bb013c639c7e0d4bcc2afc19c6b49241e;hp=6a56bc4830308cc9a01698fe9a7f3f2fe68594be;hb=9e734911e96ae83b0f41afa5073d5313bc197d96;hpb=81922a41721f8e7ec02186235edc1769e06f6b2c

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a56bc4..6ac5415 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,28 +1,32 @@
 SUBDIRS = plugins
 
-AM_CFLAGS   = -Wall --std=gnu99 $(GIS_CFLAGS)
-AM_LDFLAGS  = -Wl,--export-dynamic
+AM_CFLAGS   = -Wall --std=gnu99 $(GRITS_CFLAGS)
+AM_LDFLAGS  = -Wl,--export-dynamic -Wl,--no-undefined
+
+if !SYS_MAC
+AM_LDFLAGS += -Wl,--as-needed 
+endif
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
 	aweather-gui.c      aweather-gui.h \
 	aweather-location.c aweather-location.h
 aweather_CPPFLAGS = \
-	-DHTMLDIR="\"$(dots)$(htmldir)\"" \
-	-DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
-	-DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
-aweather_LDADD    = $(GIS_LIBS)
+	-DHTMLDIR="\"$(DOTS)$(htmldir)\"" \
+	-DICONDIR="\"$(DOTS)$(datadir)/icons\"" \
+	-DPKGDATADIR="\"$(DOTS)$(pkgdatadir)\"" \
+	-DPLUGINSDIR="\"$(DOTS)$(pkglibdir)\""
+aweather_LDADD    = $(GRITS_LIBS)
 
 wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
 
-if WIN32
-dots = ..
-
+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)
@@ -30,17 +34,38 @@ aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
 aweather_dbg_LDADD    = $(aweather_LDADD)
 endif
 
-.rc.o: ../data/aweather.ico
+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
-	.libs/aweather -o -d 7
+	.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
 	gdb .libs/aweather
 
 ddd: all
 	ddd .libs/aweather
+
+memcheck: all
+	G_SLICE=always-malloc                   \
+	G_DEBUG=gc-friendly,resident-modules    \
+	valgrind --track-origins=yes            \
+	         --leak-check=full              \
+	         --leak-resolution=high         \
+	         --num-callers=50               \
+	         --suppressions=gtk.suppression \
+	         --suppressions=/usr/lib/valgrind/default.supp \
+	         .libs/aweather                 \
+	2> valgrind.out