Author: tom
Date: Mon Dec 15 08:12:31 2008
New Revision: 3533

URL: http://svn.slimdevices.com?rev=3533&root=Jive&view=rev
Log:
Added tarballs for the other pango dependencies - updated Makefile.osx to 
support this

Modified:
    7.4/branches/pango/squeezeplay/src/Makefile.osx

Modified: 7.4/branches/pango/squeezeplay/src/Makefile.osx
URL: 
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/Makefile.osx?rev=3533&root=Jive&r1=3532&r2=3533&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.osx (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.osx Mon Dec 15 08:12:31 2008
@@ -74,12 +74,16 @@
 sdl-all: freetype libpng libjpeg expat gettext glib2 fontconfig pixman cairo 
pango sdl sdl-image sdl-ttf sdl-gfx sdl-pango
 
 # freetype
-freetype-2.3.5/config.mk:
-       cd freetype-2.3.5; ./configure  --enable-shared --host=${TARGET} 
--target=${TARGET} --prefix=${PREFIX} 
-
-freetype: freetype-2.3.5/config.mk
-       cd freetype-2.3.5; make; make DESTDIR= install
-
+FREETYPE_DIR=freetype-2.3.5
+generated/${FREETYPE_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${FREETYPE_DIR}.tar.gz;
+       
+generated/${FREETYPE_DIR}/config.mk: 
+       cd generated/${FREETYPE_DIR}; ./configure  --enable-shared 
--host=${TARGET} --target=${TARGET} --prefix=${PREFIX}
+
+freetype: generated/${FREETYPE_DIR}/configure 
generated/${FREETYPE_DIR}/config.mk
+       cd generated/${FREETYPE_DIR}; make; make DESTDIR= install
+       
 # png also add clean
 libpng-1.2.32/Makefile:
        cd libpng-1.2.32; ./configure  --prefix=${PREFIX}
@@ -132,34 +136,47 @@
        cd SDL_gfx-2.0.15; make SDL_CONFIG=${PREFIX}/bin/sdl-config && make 
install
 
 # expat
-expat-2.0.0/Makefile:
-       cd expat-2.0.0; ./configure  --enable-shared --prefix=${PREFIX}
-       
-expat: expat-2.0.0/Makefile
-       cd expat-2.0.0; make && make install
-
-# gettext 
-generated/gettext-0.14.1/configure:
-       mkdir -p generated; cd generated; tar xvf ../gettext-0.14.1.tar.gz
-       
-generated/gettext-0.14.1/Makefile: 
-       cd generated/gettext-0.14.1; ./configure  --enable-shared 
--prefix=${PREFIX} --disable-csharp --without-emacs \
+EXPAT_DIR = expat-2.0.0
+generated/${EXPAT_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${EXPAT_DIR}.tar.gz
+       
+generated/${EXPAT_DIR}/Makefile: 
+       cd generated/${EXPAT_DIR}; ./configure  --enable-shared 
--prefix=${PREFIX}
+
+expat: generated/${EXPAT_DIR}/configure generated/${EXPAT_DIR}/Makefile
+       cd generated/${EXPAT_DIR}; make && make install
+       
+# gettext
+GETTEXT_DIR = gettext-0.14.1
+generated/${GETTEXT_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${GETTEXT_DIR}.tar.gz
+       
+generated/${GETTEXT_DIR}/Makefile: 
+       cd generated/${GETTEXT_DIR}; ./configure  --enable-shared 
--prefix=${PREFIX} --disable-csharp --without-emacs \
         --with-included-gettext --with-included-glib --with-included-libcroco 
--with-included-libxml
 
-gettext: generated/gettext-0.14.1/configure generated/gettext-0.14.1/Makefile
-       cd generated/gettext-0.14.1; make && make install
+gettext: generated/${GETTEXT_DIR}/configure generated/${GETTEXT_DIR}/Makefile
+       cd generated/${GETTEXT_DIR}; make && make install
        
 # glib2
-glib-2.16.4/Makefile:
-       PATH=${PREFIX}/bin:${PATH}; cd glib-2.16.4; ./configure  
--enable-shared --prefix=${PREFIX} LDFLAGS="${LDFLAGS} -L${PREFIX}/lib/gettext"
-
-glib2: glib-2.16.4/Makefile
-       cd glib-2.16.4; make && make install
-
-#hardcoding temp system-singleton locations for now to tmp until we resolve a 
location/alternative
+GLIB2_DIR = glib-2.16.4
+generated/${GLIB2_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${GLIB2_DIR}.tar.gz
+       
+generated/${GLIB2_DIR}/Makefile: 
+       PATH=${PREFIX}/bin:${PATH}; cd generated/${GLIB2_DIR}; ./configure  
--enable-shared --prefix=${PREFIX} LDFLAGS="${LDFLAGS} -L${PREFIX}/lib/gettext"
+
+glib2: generated/${GLIB2_DIR}/configure generated/${GLIB2_DIR}/Makefile
+       cd generated/${GLIB2_DIR}; make && make install
+
+#hardcoding temp system-singleton locations for now to tmp until we determine 
a location/alternative
 #fontconfig
-fontconfig-2.6.0/Makefile:
-       cd fontconfig-2.6.0; ./configure  --enable-shared \
+FONTCONFIG_DIR = fontconfig-2.6.0
+generated/${FONTCONFIG_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${FONTCONFIG_DIR}.tar.gz
+       
+generated/${FONTCONFIG_DIR}/Makefile: 
+       PATH=${PREFIX}/bin:${PATH}; cd generated/${FONTCONFIG_DIR}; ./configure 
 --enable-shared \
        --with-add-fonts=/tmp/splocal/fonts/ \
        --sysconfdir=/tmp/splocal/etc \
        --localstatedir=/tmp/splocal/var \
@@ -170,45 +187,50 @@
 
 #      
--with-add-fonts=/usr/X11R6/lib/X11/fonts,/Library/Fonts,/Network/Library/Fonts,/System/Library/Fonts
 \
 
-fontconfig: fontconfig-2.6.0/Makefile
+fontconfig: generated/${FONTCONFIG_DIR}/configure 
generated/${FONTCONFIG_DIR}/Makefile
        -mkdir -p /tmp/splocal/fonts/
        cp freefont-20060126/Free*ttf /tmp/splocal/fonts/
-       cd fontconfig-2.6.0; make && make install
-       
+       cd generated/${FONTCONFIG_DIR}; make && make install
        
 # pixman 
-generated/pixman-0.12.0/configure:
-       mkdir -p generated; cd generated; tar xvf ../pixman-0.12.0.tar.gz
-       
-generated/pixman-0.12.0/Makefile: 
-       cd generated/pixman-0.12.0; ./configure  --enable-shared --disable-gtk 
--prefix=${PREFIX}
-
-pixman: generated/pixman-0.12.0/configure generated/pixman-0.12.0/Makefile
-       cd generated/pixman-0.12.0; make && make install
+PIXMAN_DIR = pixman-0.12.0
+generated/${PIXMAN_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${PIXMAN_DIR}.tar.gz
+       
+generated/${PIXMAN_DIR}/Makefile: 
+       cd generated/${PIXMAN_DIR}; ./configure  --enable-shared --disable-gtk 
--prefix=${PREFIX}
+
+pixman: generated/${PIXMAN_DIR}/configure generated/${PIXMAN_DIR}/Makefile
+       cd generated/${PIXMAN_DIR}; make && make install
                
        
 # cairo
-cairo-1.6.4/Makefile:
-       cd cairo-1.6.4; ./configure  --enable-shared --disable-docs \
+CAIRO_DIR = cairo-1.6.4
+generated/${CAIRO_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${CAIRO_DIR}.tar.gz
+       
+generated/${CAIRO_DIR}/Makefile: 
+       PATH=${PREFIX}/bin:${PATH}; cd generated/${CAIRO_DIR}; ./configure  
--enable-shared --disable-docs \
        --disable-glitz --disable-xcb --enable-freetype  --disable-xlib 
--disable-xlib-xrender --without-x --disable-atsui \
        --prefix=${PREFIX}
 
-cairo: cairo-1.6.4/Makefile
-       cd cairo-1.6.4; make && make install
-
+cairo: generated/${CAIRO_DIR}/configure generated/${CAIRO_DIR}/Makefile
+       cd generated/${CAIRO_DIR}; make && make install
+       
 # pango
-generated/pango-1.21.2/configure:
-       mkdir -p generated; cd generated; tar xvf ../pango-1.21.2.tar.gz
-       
-generated/pango-1.21.2/Makefile: 
-       cd generated/pango-1.21.2; ./configure  --enable-shared --disable-docs \
+PANGO_DIR = pango-1.21.2
+generated/${PANGO_DIR}/configure:
+       mkdir -p generated; cd generated; tar xvf ../${PANGO_DIR}.tar.gz
+       
+generated/${PANGO_DIR}/Makefile: 
+       cd generated/${PANGO_DIR}; ./configure  --enable-shared --disable-docs \
        --without-x \
        --sysconfdir=/tmp/splocal/etc \
        --localstatedir=/tmp/splocal/var \
        --prefix=${PREFIX}
 
-pango: generated/pango-1.21.2/configure generated/pango-1.21.2/Makefile
-       PATH=${PREFIX}/bin:${PATH}; cd generated/pango-1.21.2; make && make 
install
+pango: generated/${PANGO_DIR}/configure generated/${PANGO_DIR}/Makefile
+       PATH=${PREFIX}/bin:${PATH}; cd generated/${PANGO_DIR}; make && make 
install
 
 #####
 # lua

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to