Fix win32 compile issues

[aweather] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c955106bbb16b09f19d10b6ac3e9c3e49c5e6187..b0ea82cbb609e94b6b606ad89b6ae9d450eeabaa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,18 @@
 SUBDIRS = plugins
 
-AM_CFLAGS   = -Wall --std=gnu99 
-AM_CPPFLAGS = $(GIS_CFLAGS)
-LIBS        = $(GIS_LIBS)
+AM_CFLAGS = -Wall --std=gnu99 
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
        aweather-gui.c      aweather-gui.h \
        aweather-location.c aweather-location.h
-aweather_CPPFLAGS = $(AM_CPPFLAGS) \
-                   -DPKGDATADIR="\"$(pkgdatadir)\"" -DPLUGINSDIR="\"$(pkglibdir)\""
+aweather_CPPFLAGS = -DPKGDATADIR="\"$(pkgdatadir)\"" -DPLUGINSDIR="\"$(pkglibdir)\""
+aweather_CFLAGS   = $(GIS_CFLAGS) $(AM_CFLAGS)
+aweather_LDADD    = $(GIS_LIBS)
 
-wsr88ddec       = wsr88ddec.c
-wsr88ddec_LDADD = -lbz2
+wsr88ddec         = wsr88ddec.c
+wsr88ddec_CFLAGS  = $(GLIB_CFLAGS) $(AM_CFLAGS)
+wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
 
 CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in