Mac OS debugging, update gen rules

[~andy/aweather-pkg] / mac / Makefile

diff --git a/mac/Makefile b/mac/Makefile
index 43d98107d401aec0db3391cb8c807e9984009986..02a79cbb96178011dc07fe832effd1a2ac9253dc 100644 (file)
--- a/mac/Makefile
+++ b/mac/Makefile
@@ -1,6 +1,7 @@
 include ../config.mk
 
 DESTDIR  = $(MAC_AWEATHER)/build
+SRCDMG   = $(MAC_AWEATHER)/aweather-$(VER_AWEATHER).dmg
 PACKAGES = $(FILES)/aweather-$(VER_AWEATHER).dmg
 GTKINST  = /Users/andy/gtk/inst
 export DESTDIR GTKINST MAC_AWEATHER
@@ -8,7 +9,13 @@ export DESTDIR GTKINST MAC_AWEATHER
 all-mac: $(PACKAGES)
        @echo all-mac
 
-$(DESTDIR): $(MAC_AWEATHER)/src/aweather
+clean:
+       rm -rf $(PACKAGES) $(SRCDMG) \
+               $(DESTDIR) $(MAC_AWEATHER)/AWeather.app
+
+$(DESTDIR): $(MAC_AWEATHER)/src/aweather \
+            $(MAC_GRITS)/src/libgrits.la \
+            $(MAC_RSL)/src/librsl.la
        make -C $(MAC_AWEATHER) install
        make -C $(MAC_GRITS)    install
        make -C $(MAC_RSL)      install
@@ -18,24 +25,49 @@ $(DESTDIR): $(MAC_AWEATHER)/src/aweather
        rm -rf $(DESTDIR)/include
        touch $@
 
+$(MAC_AWEATHER)/src/aweather: \
+               $(MAC_GRITS)/src/libgrits.la \
+               $(MAC_RSL)/src/librsl.la
+       jhbuild run make -C $(MAC_AWEATHER)
+
+$(MAC_GRITS)/src/libgrits.la:
+       jhbuild run make -C $(MAC_GRITS)
+
+$(MAC_RSL)/src/librsl.la:
+       jhbuild run make -C $(MAC_RSL)
+
 $(PACKAGES): $(DESTDIR)
+       rm -f $(SRCDMG)
+       ln -sf /usr/bin/open $(GTKINST)/bin/xdg-open
        rsync -uav $(DESTDIR)/ $(GTKINST)/
        jhbuild run gtk-mac-bundler aweather.bundle
        create-dmg --volname 'AWeather-$(VER_AWEATHER)' \
-               $(MAC_AWEATHER)/aweather-$(VER_AWEATHER).dmg \
-               $(MAC_AWEATHER)/AWeather.app
-       $(MAC_AWEATHER)/aweather-$(VER_AWEATHER).dmg
-       cp $(FILES)
+               $(SRCDMG) $(MAC_AWEATHER)/AWeather.app
+       cp $(SRCDMG) $(FILES)
 
 aweather-gen:
-       PKG_CONFIG_PATH="../grits/src/" \
-       ./autogen.sh "--enable-relative" \
-               CFLAGS="-g -Werror $(CFLAGS)"
+       cd $(MAC_AWEATHER); \
+       PKG_CONFIG_PATH="$(MAC_GRITS)/src" \
+       LDFLAGS="-L$(MAC_GRITS)/src/.libs" \
+       CPPFLAGS=dir="-I$(MAC_GRITS)/include" \
+       jhbuild run ./autogen.sh \
+               --enable-relative \
+               --enable-shared \
+               --disable-static \
+               CFLAGS="-g -Werror -Os"
 
 grits-gen:
-       ./autogen.sh \
+       cd $(MAC_GRITS); \
+       jhbuild run ./autogen.sh \
+               --enable-relative \
+               --enable-shared \
+               --disable-static \
+               CFLAGS="-g -Werror -Os"
+
+rsl-gen:
+       cd $(MAC_RSL); \
+       jhbuild run ./autogen.sh \
+               --enable-relative \
                --enable-shared \
                --disable-static \
-               "--libdir=$(MAC_GRITS)/src/.libs" \
-               "--includedir=$(MAC_GRITS)/include" \
-               CFLAGS="-g -Werror"
+               CFLAGS="-g -Wall -Wno-unused -Os"