X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=d3861ebfe9c8a9bb72ae79476ac5d4101dda6791;hb=5d02e9824afbc67d431e3d3e59797425f91cddcd;hp=7bba88f8b6bc0714e886754d2ece864f2c9e2e8a;hpb=d3555c59280ae44557f97e6372464b775f734f3a;p=aweather

diff --git a/src/Makefile.am b/src/Makefile.am
index 7bba88f..d3861eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 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,--as-needed -Wl,--no-undefined
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
@@ -9,17 +10,28 @@ 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    = $(GIS_LIBS)
+aweather_LDADD    = $(GRITS_LIBS)
 
 wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
 
 if WIN32
-AM_LDFLAGS       += -mwindows 
-aweather_SOURCES += resource.rc
-dots              = ..
+dots = ..
+
+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)
+aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
+aweather_dbg_LDADD    = $(aweather_LDADD)
 endif
 
 .rc.o: ../data/aweather.ico
@@ -29,7 +41,10 @@ CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in
 
 test: all
-	.libs/aweather -o -d 7
+	.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