Win32 fixes and improvements

[aweather] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 47856d062c6ed60305ceabbcb4568227f2fa00cb..535b1d052f7b3c887197800a2154cb93dbd32014 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,21 +1,29 @@
 SUBDIRS = plugins
 
-AM_CFLAGS = -Wall --std=gnu99 
+AM_CFLAGS   = -Wall --std=gnu99 $(GIS_CFLAGS)
+AM_LDFLAGS  = -Wl,--export-dynamic
 
 bin_PROGRAMS = aweather wsr88ddec
 aweather_SOURCES  = main.c \
        aweather-gui.c      aweather-gui.h \
        aweather-location.c aweather-location.h
 aweather_CPPFLAGS = \
-       -DPKGDATADIR="\"$(pkgdatadir)\"" \
-       -DPLUGINSDIR="\"$(pkglibdir)\""
-aweather_CFLAGS   = $(GIS_CFLAGS) $(AM_CFLAGS)
+       -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
+       -DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
 aweather_LDADD    = $(GIS_LIBS)
 
 wsr88ddec         = wsr88ddec.c
-wsr88ddec_CFLAGS  = $(GLIB_CFLAGS) $(AM_CFLAGS)
 wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
 
+if WIN32
+AM_LDFLAGS       += -mwindows 
+aweather_SOURCES += resource.rc
+dots              = ..
+endif
+
+.rc.o: ../data/aweather.ico
+       $(RC) -o $@ $<
+
 CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in