X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2FMakefile.am;h=fb2e6f5e4cc42e34a9a4a5f9e21fd8635fbadd8c;hb=4a7da06607e9a4d1bf93f23917198f0d5db4abd2;hp=ca40656920c4ae030e5d3e3cbd96a490eaad9091;hpb=0710ad564f97bf0e8aa3460fcb79110623d46544;p=aweather

diff --git a/src/Makefile.am b/src/Makefile.am
index ca40656..fb2e6f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 SUBDIRS = plugins
 
 AM_CFLAGS   = -Wall --std=gnu99 $(GRITS_CFLAGS)
-AM_LDFLAGS  = -Wl,--export-dynamic
+AM_LDFLAGS  = -Wl,--export-dynamic \
+              -Wl,--as-needed -Wl,--no-undefined
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
@@ -9,6 +10,7 @@ aweather_SOURCES  = main.c \
 	aweather-location.c aweather-location.h
 aweather_CPPFLAGS = \
 	-DHTMLDIR="\"$(dots)$(htmldir)\"" \
+	-DICONDIR="\"$(dots)$(datadir)/icons\"" \
 	-DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
 	-DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
 aweather_LDADD    = $(GRITS_LIBS)
@@ -24,7 +26,6 @@ wsr88ddec_LDFLAGS     = -mwindows
 aweather_SOURCES     += resource.rc
 aweather_LDFLAGS      = -mwindows
 aweather_CPPFLAGS    += -I$(top_srcdir)/lib
-aweather_LDADD       += $(top_srcdir)/lib/libgnu.la
 
 bin_PROGRAMS         += aweather-dbg
 aweather_dbg_SOURCES  = $(aweather_SOURCES)
@@ -32,7 +33,7 @@ aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
 aweather_dbg_LDADD    = $(aweather_LDADD)
 endif
 
-.rc.o: ../data/aweather.ico
+.rc.o: ../data/icons/48x48/aweather.ico
 	$(RC) -o $@ $<
 
 CLEANFILES = gmon.out valgrind.out
@@ -49,3 +50,15 @@ gdb: all
 
 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