Use git describe for Version:.

[winterboard.git] / makefile

diff --git a/makefile b/makefile
index 75594fd265fe35b4a55291521ecf4592d0a067e0..cd9ce9271150efb1545febe5af66aac339d927c3 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,6 +4,8 @@ else
 target := $(PKG_TARG)-
 endif
 
 target := $(PKG_TARG)-
 endif
 

+substrate := -I../mobilesubstrate -L../mobilesubstrate -lsubstrate
+

 all: WinterBoard WinterBoard.dylib UIImages WinterBoardSettings Optimize
 
 clean:
 all: WinterBoard WinterBoard.dylib UIImages WinterBoardSettings Optimize
 
 clean:


@@ -14,11 +16,11 @@ WinterBoardSettings: Settings.mm makefile
        ldid -S $@
 
 WinterBoard.dylib: Library.mm makefile ../mobilesubstrate/substrate.h
        ldid -S $@
 
 WinterBoard.dylib: Library.mm makefile ../mobilesubstrate/substrate.h

-       $(target)g++ -dynamiclib -g0 -O2 -Wall -o $@ $(filter %.mm,$^) -framework CoreFoundation -framework Foundation -lobjc -init _WBInitialize -I/apl/inc/iPhoneOS-2.0 -framework CoreGraphics -framework GraphicsServices -framework Celestial -I../mobilesubstrate -L../mobilesubstrate -lsubstrate -framework UIKit -F$(PKG_ROOT)/System/Library/PrivateFrameworks
+       $(target)g++ -dynamiclib -g0 -O2 -Wall -o $@ $(filter %.mm,$^) -framework CoreFoundation -framework Foundation -lobjc -init _WBInitialize -I/apl/inc/iPhoneOS-2.0 -framework CoreGraphics -framework ImageIO -framework GraphicsServices -framework Celestial $(substrate) -framework UIKit -F$(PKG_ROOT)/System/Library/PrivateFrameworks

        ldid -S $@
 
 UIImages: UIImages.mm makefile
        ldid -S $@
 
 UIImages: UIImages.mm makefile

-       $(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc -I/apl/inc/iPhoneOS-2.0
+       $(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc -I/apl/inc/iPhoneOS-2.0 $(substrate)

        ldid -S $@
 
 WinterBoard: Application.mm makefile
        ldid -S $@
 
 WinterBoard: Application.mm makefile


@@ -48,8 +50,9 @@ package: all
        cp -a WinterBoard.plist winterboard/Library/MobileSubstrate/DynamicLibraries
        cp -a *.theme winterboard/Library/Themes
        find winterboard -name .svn | while read -r line; do rm -rf "$${line}"; done
        cp -a WinterBoard.plist winterboard/Library/MobileSubstrate/DynamicLibraries
        cp -a *.theme winterboard/Library/Themes
        find winterboard -name .svn | while read -r line; do rm -rf "$${line}"; done

-       cp -a control preinst prerm winterboard/DEBIAN
+       cp -a extrainst_ preinst prerm winterboard/DEBIAN
+       sed -e 's/VERSION/$(shell ./version.sh)/g' control >winterboard/DEBIAN/control

        cp -a Test.sh Icon-Small.png icon.png WinterBoard.dylib WinterBoard UIImages Info.plist winterboard/Applications/WinterBoard.app
        cp -a Test.sh Icon-Small.png icon.png WinterBoard.dylib WinterBoard UIImages Info.plist winterboard/Applications/WinterBoard.app

-       dpkg-deb -b winterboard winterboard_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+       dpkg-deb -b winterboard "winterboard_$$(grep ^Version: winterboard/DEBIAN/control | cut -d ' ' -f 2)_iphoneos-arm.deb"

 
 .PHONY: all clean package
 
 .PHONY: all clean package