Author: tom
Date: Mon Sep 29 14:50:25 2008
New Revision: 3017
URL: http://svn.slimdevices.com?rev=3017&root=Jive&view=rev
Log:
separated dmg target
Modified:
7.3/trunk/squeezeplay/src/Makefile.osx
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
Modified: 7.3/trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/Makefile.osx?rev=3017&root=Jive&r1=3016&r2=3017&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/Makefile.osx (original)
+++ 7.3/trunk/squeezeplay/src/Makefile.osx Mon Sep 29 14:50:25 2008
@@ -160,8 +160,8 @@
# squeezeplay
#
-.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_test freefont
-app: portaudio flac libmad tremor libpng libjpeg squeezeplay
squeezeplay_desktop squeezeplay_test freefont
+.PHONY: app portaudio flac libmad tremor squeezeplay squeezeplay_desktop
squeezeplay_test freefont squeezeplay_dmg
+app: portaudio flac libmad tremor libpng libjpeg squeezeplay
squeezeplay_desktop squeezeplay_test freefont squeezeplay_dmg
# portaudio
portaudio_v19_1360/Makefile:
@@ -214,7 +214,7 @@
squeezeplay: squeezeplay/Makefile
export PATH=$(BUILD_TOP)/bin:$(PATH); \
- cd squeezeplay; make && make install && make SqueezePlay_dmg
+ cd squeezeplay; make && make install
squeezeplay_desktop/Makefile:
cd squeezeplay_desktop; SDL_CONFIG=${SDL_CONFIG} ./configure
--prefix=${PREFIX}
@@ -234,6 +234,8 @@
cp fonts-clock/Digital.ttf ${PREFIX}/share/jive/fonts
cp fonts-clock/DigitalItalic.ttf ${PREFIX}/share/jive/fonts
+squeezeplay_dmg: squeezeplay/Makefile
+ cd squeezeplay; make SqueezePlay_dmg
#
# clean
#
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=3017&root=Jive&r1=3016&r2=3017&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.am Mon Sep 29 14:50:25 2008
@@ -16,9 +16,11 @@
@test \! -s badsyntax
@rm -f badsyntax
-
-OSX_LIB_DIR = $(top_builddir)/../../build/osx/lib
-OSX_BUILD_DIR = $(top_builddir)/../../build/osx
+##install-data-local:
+## cp -pR share/ $(top_builddir)/../../build/twtemp/
+
+OSX_LIB_DIR = $(PREFIX)/lib
+OSX_BUILD_DIR = $(PREFIX)
JIVE_DEPENDENCIES_LIB_DIR = $(top_builddir)/.libs
JIVE_STATIC_PROGRAM = SqueezePlay
@@ -117,6 +119,7 @@
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
-rm $(DMG_TMP_IMAGE_FILENAME)
+ cp -p $(DMG_IMAGE_FILENAME) $(OSX_BUILD_DIR)/
# Convenience library:
noinst_LTLIBRARIES = libjiveui.la libjiveaudio.la libjivenet.la
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=3017&root=Jive&r1=3016&r2=3017&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/Makefile.in Mon Sep 29 14:50:25 2008
@@ -361,8 +361,8 @@
# Rules for tolua++ binding files
SUFFIXES = .pkg
TOLUA = tolua++
-OSX_LIB_DIR = $(top_builddir)/../../build/osx/lib
-OSX_BUILD_DIR = $(top_builddir)/../../build/osx
+OSX_LIB_DIR = $(PREFIX)/lib
+OSX_BUILD_DIR = $(PREFIX)
JIVE_DEPENDENCIES_LIB_DIR = $(top_builddir)/.libs
JIVE_STATIC_PROGRAM = SqueezePlay
OSX_STATIC_LIBS = `$(SDL_CONFIG) --static-libs` \
@@ -2546,6 +2546,7 @@
rm -rf $(DMG_IMAGE_DIR)
rm -rf $(DMG_TEMP_DIR)
-rm $(DMG_TMP_IMAGE_FILENAME)
+ cp -p $(DMG_IMAGE_FILENAME) $(OSX_BUILD_DIR)/
src/version.h: FORCE
@echo '/* This file is automatically generated */' > src/version.h
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
