Author: titmuss
Date: Tue Feb 26 05:51:54 2008
New Revision: 2032
URL: http://svn.slimdevices.com?rev=2032&root=Jive&view=rev
Log:
Bug: 6975
Description:
Renaming.
Modified:
trunk/squeezeplay/src/Makefile.linux
trunk/squeezeplay/src/Makefile.osx
trunk/squeezeplay/src/Makefile.squeezeos
trunk/squeezeplay/src/lua-5.1.1/Makefile
trunk/squeezeplay/src/lua-5.1.1/src/Makefile
Modified: trunk/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/Makefile.linux?rev=2032&root=Jive&r1=2031&r2=2032&view=diff
==============================================================================
--- trunk/squeezeplay/src/Makefile.linux (original)
+++ trunk/squeezeplay/src/Makefile.linux Tue Feb 26 05:51:54 2008
@@ -1,10 +1,10 @@
################################################################################
-# Jive makefile for Linux
+# Squeezeplay makefile for Linux
# Copyright 2007 Logitech
################################################################################
#
-# Absolute path to top of JIVE directories
+# Absolute path to top of SQUEEZEPLAY directories
#
SRC_DIR = $(realpath ${PWD}/..)
@@ -139,21 +139,21 @@
#
-# jive
+# squeezeplay
#
-.PHONY: app jive jive_desktop freefont freefont-debian
-app: jive jive_desktop freefont
+.PHONY: app squeezeplay squeezeplay_desktop freefont freefont-debian
+app: squeezeplay squeezeplay_desktop freefont
-# jive
-jive/Makefile:
- cd jive; SDL_CONFIG=${SDL_CONFIG} ./configure ${ENABLE_PROFILING}
--prefix=${PREFIX}
+# squeezeplay
+squeezeplay/Makefile:
+ cd squeezeplay; SDL_CONFIG=${SDL_CONFIG} ./configure
${ENABLE_PROFILING} --prefix=${PREFIX}
-jive: jive/Makefile
- cd jive; make && make install
+squeezeplay: squeezeplay/Makefile
+ cd squeezeplay; make && make install
-jive_desktop: jive/Makefile
- cd jive_desktop; make PREFIX=${PREFIX}
+squeezeplay_desktop: squeezeplay/Makefile
+ cd squeezeplay_desktop; make PREFIX=${PREFIX}
# freefont
freefont:
@@ -184,4 +184,4 @@
-cd luazipfilter; make distclean
-cd luaprofiler-2.0; make -f Makefile.linux clean
-cd tolua++-1.0.92/src/lib; rm libtolua++.so; rm *.o
- -cd jive; make distclean
+ -cd squeezeplay; make distclean
Modified: trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/Makefile.osx?rev=2032&root=Jive&r1=2031&r2=2032&view=diff
==============================================================================
--- trunk/squeezeplay/src/Makefile.osx (original)
+++ trunk/squeezeplay/src/Makefile.osx Tue Feb 26 05:51:54 2008
@@ -1,5 +1,5 @@
################################################################################
-# Jive makefile for OS X
+# Squeezeplay makefile for OS X
# Copyright 2007 Logitech
################################################################################
@@ -21,7 +21,7 @@
#
-# Absolute path to top of JIVE directories
+# Absolute path to top of SQUEEZEPLAY directories
#
# OSX 10.4 has GNU Make 3.8, which does not support realpath (need Make 3.81).
@@ -157,22 +157,22 @@
#
-# jive
-#
-
-.PHONY: app jive jive_desktop freefont
-app: jive jive_desktop freefont
-
-# jive
-jive/Makefile:
- cd jive; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--prefix=${PREFIX}
-
-jive: jive/Makefile
+# squeezeplay
+#
+
+.PHONY: app squeezeplay squeezeplay_desktop freefont
+app: squeezeplay squeezeplay_desktop freefont
+
+# squeezeplay
+squeezeplay/Makefile:
+ cd squeezeplay; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--prefix=${PREFIX}
+
+squeezeplay: squeezeplay/Makefile
export PATH=$(BUILD_TOP)/bin:$(PATH); \
- cd jive; make && make install
-
-jive_desktop: jive/Makefile
- cd jive_desktop; make PREFIX=${PREFIX}
+ cd squeezeplay; make && make install
+
+squeezeplay_desktop:
+ cd squeezeplay_desktop; make PREFIX=${PREFIX}
# freefont
freefont:
@@ -190,8 +190,8 @@
.PHONY: clean
clean:
@echo "----------------------------------------------------------"
- @echo "Cleaning: jive"
- -cd jive; make clean
+ @echo "Cleaning: squeezeplay"
+ -cd squeezeplay; make clean
@echo "----------------------------------------------------------"
@echo "Cleaning: SDL"
-cd SDL-1.2.11; make distclean; rm -f include/SDL_config.h;
Modified: trunk/squeezeplay/src/Makefile.squeezeos
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/Makefile.squeezeos?rev=2032&root=Jive&r1=2031&r2=2032&view=diff
==============================================================================
--- trunk/squeezeplay/src/Makefile.squeezeos (original)
+++ trunk/squeezeplay/src/Makefile.squeezeos Tue Feb 26 05:51:54 2008
@@ -1,13 +1,13 @@
# Absolute path to top of source directories
SRCDIR = $(realpath ${PWD})
-TOPSRCDIR = $(realpath ${PWD}/../../../squeezeboxJive/build)
+TOPSRCDIR = $(realpath ${PWD}/../../../squeezeos/build)
TOPDIR = $(dir ${TOPSRCDIR})
export BUILDDIR=$(TOPDIR)build
export PREFIX=${BUILDDIR}/usr
-export CFLAGS=-I${PREFIX}/include -I${SRCDIR}/jive/src/ui -Os
+export CFLAGS=-I${PREFIX}/include -I${SRCDIR}/squeezeplay/src/ui -Os
export LDFLAGS=-L${PREFIX}/lib
TARGET=arm-926ejs-linux-gnueabi
@@ -28,7 +28,7 @@
# Top level targets
#
.PHONY: all
-all: sdl-all lua-all jive-all
+all: sdl-all lua-all squeezeplay-all
@@ -84,7 +84,7 @@
# lua (requires readline ncurses)
lua:
- cd lua-5.1.1; make squeezeboxjive CFLAGS='-I${PREFIX}/include'
INSTALL_TOP=${PREFIX} TARGET=$(TARGET) && make install INSTALL_TOP=${PREFIX}
TARGET=$(TARGET)
+ cd lua-5.1.1; make squeezeos CFLAGS='-I${PREFIX}/include'
INSTALL_TOP=${PREFIX} TARGET=$(TARGET) && make install INSTALL_TOP=${PREFIX}
TARGET=$(TARGET)
# luasocket (requires lua)
luasocket: lua
@@ -138,31 +138,31 @@
install tolua++-1.0.92/src/lib/libtolua++.so ${PREFIX}/lib
#
-# jive
+# squeezeplay
#
-.PHONY: jive-all jive jive_squeezeboxjive freefont fonts-clock
-jive-all: jive jive_squeezeboxjive freefont fonts-clock
+.PHONY: squeezeplay-all squeezeplay squeezeplay_squeezeos freefont fonts-clock
+squeezeplay-all: squeezeplay squeezeplay_squeezeos freefont fonts-clock
-# jive
-jive/Makefile:
- cd jive; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--host=${TARGET} --target=${TARGET} --prefix=/usr ${ENABLE_PROFILING}
--enable-tests
+# squeezeplay
+squeezeplay/Makefile:
+ cd squeezeplay; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--host=${TARGET} --target=${TARGET} --prefix=/usr ${ENABLE_PROFILING}
--enable-tests
-jive: jive/Makefile
- cd jive; make && make install DESTDIR=${BUILDDIR}
+squeezeplay: squeezeplay/Makefile
+ cd squeezeplay; make && make install DESTDIR=${BUILDDIR}
-jive_squeezeboxjive/Makefile:
- cd jive_squeezeboxjive; SDL_CONFIG=${PREFIX}/bin/sdl-config ./configure
--host=${TARGET} --target=${TARGET} --prefix=/usr
+squeezeplay_squeezeos/Makefile:
+ cd squeezeplay_squeezeos; SDL_CONFIG=${PREFIX}/bin/sdl-config
./configure --host=${TARGET} --target=${TARGET} --prefix=/usr
-jive_squeezeboxjive: jive_squeezeboxjive/Makefile
- cd jive_squeezeboxjive; make && make DESTDIR=${BUILDDIR} install
+squeezeplay_squeezeos: squeezeplay_squeezeos/Makefile
+ cd squeezeplay_squeezeos; make && make DESTDIR=${BUILDDIR} install
rm ${PREFIX}/lib/jiveBSP.*
- cp jive_squeezeboxjive/.libs/jiveBSP.so ${PREFIX}/lib/lua/5.1/jiveBSP.so
+ cp squeezeplay_squeezeos/.libs/jiveBSP.so
${PREFIX}/lib/lua/5.1/jiveBSP.so
rm ${PREFIX}/lib/jiveWireless.*
- cp jive_squeezeboxjive/.libs/jiveWireless.so
${PREFIX}/lib/lua/5.1/jiveWireless.so
+ cp squeezeplay_squeezeos/.libs/jiveWireless.so
${PREFIX}/lib/lua/5.1/jiveWireless.so
rm ${PREFIX}/lib/jiveWatchdog.*
- cp jive_squeezeboxjive/.libs/jiveWatchdog.so
${PREFIX}/lib/lua/5.1/jiveWatchdog.so
+ cp squeezeplay_squeezeos/.libs/jiveWatchdog.so
${PREFIX}/lib/lua/5.1/jiveWatchdog.so
freefont:
@@ -191,5 +191,5 @@
-cd luazipfilter; make distclean
-cd luaprofiler; make -f Makefile.linux clean
-cd tolua++-1.0.92/src/lib; rm libtolua++.so; rm *.o
- -cd jive; make distclean
- -cd jive_squeezeboxjive; make distclean
+ -cd squeezeplay; make distclean
+ -cd squeezeplay_squeezeos; make distclean
Modified: trunk/squeezeplay/src/lua-5.1.1/Makefile
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/lua-5.1.1/Makefile?rev=2032&root=Jive&r1=2031&r2=2032&view=diff
==============================================================================
--- trunk/squeezeplay/src/lua-5.1.1/Makefile (original)
+++ trunk/squeezeplay/src/lua-5.1.1/Makefile Tue Feb 26 05:51:54 2008
@@ -38,7 +38,7 @@
# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
# Convenience platforms targets.
-PLATS= aix ansi bsd generic linux squeezeboxjive macosx mingw posix solaris
+PLATS= aix ansi bsd generic linux squeezeos macosx mingw posix solaris
# What to install.
TO_BIN= lua luac
Modified: trunk/squeezeplay/src/lua-5.1.1/src/Makefile
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/lua-5.1.1/src/Makefile?rev=2032&root=Jive&r1=2031&r2=2032&view=diff
==============================================================================
--- trunk/squeezeplay/src/lua-5.1.1/src/Makefile (original)
+++ trunk/squeezeplay/src/lua-5.1.1/src/Makefile Tue Feb 26 05:51:54 2008
@@ -102,7 +102,7 @@
linux:
$(MAKE) all MYCFLAGS="-O2 -Wall -fpic -DLUA_USE_LINUX" MYLIBS="-Wl,-E
-ldl -lreadline -lhistory -lncurses" OSXPREFIX="pwd"
-squeezeboxjive:
+squeezeos:
$(MAKE) all MYCFLAGS="-Os -Wall -fpic -DLUA_USE_POSIX -DLUA_USE_DLOPEN"
MYLIBS="-Wl,-E -ldl" OSXPREFIX="pwd"
macosx:
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
