Convert GtkBox and GtkScale to GTK 3 version

[aweather] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e31c39463e4f30824660944c681d4b91b0fbdd7c..6ac5415bb013c639c7e0d4bcc2afc19c6b49241e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,18 +12,16 @@ aweather_SOURCES  = main.c \
        aweather-gui.c      aweather-gui.h \
        aweather-location.c aweather-location.h
 aweather_CPPFLAGS = \
-       -DHTMLDIR="\"$(dots)$(htmldir)\"" \
-       -DICONDIR="\"$(dots)$(datadir)/icons\"" \
-       -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
-       -DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
+       -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 SYS_WIN
-dots = ..
-
 wsr88ddec_LDFLAGS     = -mwindows
 
 aweather_SOURCES     += resource.rc
@@ -36,6 +34,11 @@ aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
 aweather_dbg_LDADD    = $(aweather_LDADD)
 endif
 
+if SYS_MAC
+aweather_CPPFLAGS    += $(MAC_CFLAGS)
+aweather_LDADD       += $(MAC_LIBS)
+endif
+
 .rc.o: ../data/icons/48x48/aweather.ico
        $(RC) -o $@ $<
 
@@ -43,7 +46,8 @@ CLEANFILES = gmon.out valgrind.out
 MAINTAINERCLEANFILES = Makefile.in
 
 test: all
-       .libs/aweather -o -d 7 -s KOUN -t '2011-02-01 10:01Z'
+       .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'