X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mac%2FMakefile;h=49aca8a52d939a729a3ba2707f502e9e3cd3d65d;hb=HEAD;hp=02a79cbb96178011dc07fe832effd1a2ac9253dc;hpb=2fcd63b838301d2f0efde483ae1267c1fd5b72ed;p=~andy%2Faweather-pkg

diff --git a/mac/Makefile b/mac/Makefile
index 02a79cb..49aca8a 100644
--- a/mac/Makefile
+++ b/mac/Makefile
@@ -13,43 +13,43 @@ 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
+$(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)' \
+		$(SRCDMG) $(MAC_AWEATHER)/AWeather.app
+	cp $(SRCDMG) $(FILES)
+
+destdir $(DESTDIR): $(MAC_GRITS)/src/libgrits.la \
+            $(MAC_RSL)/src/librsl.la \
+            $(MAC_AWEATHER)/src/aweather
 	make -C $(MAC_GRITS)    install
 	make -C $(MAC_RSL)      install
+	make -C $(MAC_AWEATHER) install
 	find $(DESTDIR) -name '*.a'  -delete
 	find $(DESTDIR) -name '*.la' -delete
-	rm -rf $(DESTDIR)/share/rsl/colors
+	rm -rf $(DESTDIR)/share/rsl1/colors
 	rm -rf $(DESTDIR)/include
 	touch $@
 
-$(MAC_AWEATHER)/src/aweather: \
+aweather-build $(MAC_AWEATHER)/src/aweather: \
 		$(MAC_GRITS)/src/libgrits.la \
 		$(MAC_RSL)/src/librsl.la
-	jhbuild run make -C $(MAC_AWEATHER)
+	jhbuild run make -C $(MAC_AWEATHER) -j8
 
-$(MAC_GRITS)/src/libgrits.la:
-	jhbuild run make -C $(MAC_GRITS)
+grits-build $(MAC_GRITS)/src/libgrits.la:
+	jhbuild run make -C $(MAC_GRITS) -j8
 
-$(MAC_RSL)/src/librsl.la:
+rsl-build $(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)' \
-		$(SRCDMG) $(MAC_AWEATHER)/AWeather.app
-	cp $(SRCDMG) $(FILES)
-
 aweather-gen:
 	cd $(MAC_AWEATHER); \
 	PKG_CONFIG_PATH="$(MAC_GRITS)/src" \
-	LDFLAGS="-L$(MAC_GRITS)/src/.libs" \
-	CPPFLAGS=dir="-I$(MAC_GRITS)/include" \
+	LDFLAGS="-L$(MAC_GRITS)/src/.libs -L$(MAC_RSL)/src/.libs" \
+	CPPFLAGS="-I$(MAC_GRITS)/include/grits -I$(MAC_RSL)/src" \
 	jhbuild run ./autogen.sh \
 		--enable-relative \
 		--enable-shared \