Mac OS debugging, update gen rules

diff --git a/config.mk.sample b/config.mk.sample
index 7c3df8cf97f7912f0e63b6de2f14902d3d9c33ec..0a67df59da75197eefde7aea270356bd586bc62f 100644 (file)
--- a/config.mk.sample
+++ b/config.mk.sample
@@ -1,7 +1,7 @@
 FILES        = /scratch/aweather-pkg/files
 
 VER_AWEATHER = 0.6.1
-VER_GRITS    = 0.6.1
+VER_GRITS    = 0.6.2
 VER_RSL      = 1.42
 
 SRC_AWEATHER = /scratch/aweather

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"

diff --git a/mac/aweather.bundle b/mac/aweather.bundle
index 64d5f9de37fb272492e479590fd0dc1a6de0be80..e526fe36555f79fb342f699cedf68210d05a3c3a 100644 (file)
--- a/mac/aweather.bundle
+++ b/mac/aweather.bundle
@@ -17,9 +17,11 @@
        <binary>${prefix}/bin/xdg-open</binary>
        <binary>${prefix}/lib/aweather/*.so</binary>
        <binary>${prefix}/lib/grits2/*.so</binary>
+       <binary>${prefix}/lib/libgrits*</binary>
+       <binary>${prefix}/lib/librsl*</binary>
        <data>${prefix}/share/aweather</data>
        <data>${prefix}/share/doc/aweather</data>
-       <data>${prefix}/share/rsl/*.dat</data>
+       <data>${prefix}/share/rsl1/*.dat</data>
        <data>${prefix}/share/icons/hicolor/16x16/apps/aweather.png</data>
        <data>${prefix}/share/icons/hicolor/22x22/apps/aweather.png</data>
        <data>${prefix}/share/icons/hicolor/24x24/apps/aweather.png</data>
@@ -35,7 +37,7 @@
 
        <data>${prefix}/share/themes/Clearlooks</data>
        <data>${prefix}/share/themes/Default</data>
-       <data>${prefix}/share/themes/Mac</data>
-       <data>${prefix}/share/themes/Quartz</data>
+       <!-- <data>${prefix}/share/themes/Mac</data> -->
+       <!-- <data>${prefix}/share/themes/Quartz</data> -->
        <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">${project}/aweather.gtkrc</data>
 </app-bundle>

diff --git a/mac/aweather.launcher b/mac/aweather.launcher
index 63a2980bf1db429a73d240215b4af2efd2aec0fc..816cda2eb4d7221a0ae1b03a6765e3ad5e735064 100755 (executable)
--- a/mac/aweather.launcher
+++ b/mac/aweather.launcher
@@ -14,7 +14,7 @@ export GTK_PATH="$PREFIX"
 export GTK2_RC_FILES="$PREFIX/etc/gtk-2.0/gtkrc"
 export GTK_IM_MODULE_FILE="$PREFIX/etc/gtk-2.0/gtk.immodules"
 export GDK_PIXBUF_MODULE_FILE="$PREFIX/etc/gtk-2.0/gdk-pixbuf.loaders"
-export PANGO_RC_FILE="$PREFIX/etc/pango/pangorc"
+#export PANGO_RC_FILE="$PREFIX/etc/pango/pangorc"
 
 export PATH="$PATH:$PREFIX/bin"
 

diff --git a/src/Makefile b/src/Makefile
index b1d740bc234e4d4587e72ebceb1047074820508c..efc6c22f484b354ad1d2a9c953febbf45ae51010 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,18 +22,23 @@ $(PACKAGES):
 
 aweather-gen:
        cd $(SRC_AWEATHER); \
-       PKG_CONFIG_PATH="$(MAC_GRITS)" \
-       LIBS="-L$(MAC_GRITS)" \
-       CPPFLAGS="-I$(MAC_GRITS)" \
+       PKG_CONFIG_PATH="$(SRC_GRITS)/src" \
        ./autogen.sh \
-               --enable-shared \
-               --disable-static \
-               CFLAGS="-g -Werror $CFLAGS"
+               --datadir="$(SRC_AWEATHER)/data" \
+               --libdir="$(SRC_AWEATHER)/src/plugins" \
+               CFLAGS="-g -Werror $(CFLAGS)"
 
 grits-gen:
        cd $(SRC_GRITS); \
        ./autogen.sh \
-               "--enable-gtk-doc" \
-               "--libdir=$(SRC_GRITS)/src/.libs" \
-               "--includedir=$(SRC_GRITS)/include" \
+               --enable-gtk-doc \
+               --includedir="$(SRC_GRITS)/include" \
+               --libdir="$(SRC_GRITS)/src/.libs" \
                CFLAGS="-g -Werror $(CFLAGS)"
+
+rsl-gen:
+       cd $(SRC_RSL); \
+       ./autogen.sh \
+               --enable-shared \
+               --disable-static \
+               CFLAGS="-g -Wall -O3"

diff --git a/win/Makefile b/win/Makefile
index e4c63d491e6d373bf64edd1818ab7ecaaf3bd727..96982ac6706047b2993cc41ef8620ccbfe228839 100644 (file)
--- a/win/Makefile
+++ b/win/Makefile
@@ -32,9 +32,9 @@ $(INSTALLERS): $(DESTDIR)
 aweather-gen:
        cd $(WIN_AWEATHER); \
        PKG_CONFIG_PATH="$(WIN_GRITS)" \
-       LIBS="-L$(WIN_GRITS)"\
-       CPPFLAGS="-I$(WIN_GRITS)"\
-       CFLAGS="-g -Werror -Wno-unused -O3"\
+       LIBS="-L$(WIN_GRITS)" \
+       CPPFLAGS="-I$(WIN_GRITS)" \
+       CFLAGS="-g -Werror -Wno-unused -O3" \
        ./autogen.sh \
                --enable-shared \
                --disable-static \
@@ -47,3 +47,12 @@ grits-gen:
                --disable-static \
                --host=i686-pc-mingw32 \
                CFLAGS="-g -Werror -Wno-unused -O3"
+
+rsl-gen:
+       cd $(WIN_RSL); \
+       ./autogen.sh \
+               --enable-relative \
+               --enable-shared \
+               --disable-static \
+               --host=i686-pc-mingw32 \
+               CFLAGS="-g -Wall -Wno-unused -O3"