Module: ngircd.git Branch: master Commit: 5468ba37446a85bfb8a84eed74bf6c091156f682 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5468ba374... Author: Alexander Barton <alex@barton.de> Date: Tue Jan 6 16:01:52 2009 +0100 Xcode: get release number dynamically; new make target "xcode-clean". - make target "xcode" now detects the release number stored in the configure.in file and passes it to Xcode. - new make target "xcode-clean" which removes all files generated by "make xcode" and removes the Xcode build directory. --- Makefile.am | 15 ++++++++++++--- contrib/MacOSX/config.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 701bf6b..0fd0622 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,12 +32,21 @@ lint: srcdoc: make -C doc srcdoc -xcode: +have-xcodebuild: @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \ >/dev/null 2>&1 \ || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 ) + +xcode: have-xcodebuild + rel=`grep AC_INIT configure.in | cut -d' ' -f2 | cut -d')' -f1`; \ + def="GCC_PREPROCESSOR_DEFINITIONS=\"VERSION=\\\"$$rel\\\"\""; \ + xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \ + -configuration Default $$def build + +xcode-clean: have-xcodebuild xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \ - -buildstyle Development + -configuration Default clean + rm -fr contrib/MacOSX/build rpm: distcheck rpm -ta ngircd-*.tar.gz @@ -46,7 +55,7 @@ deb: [ -f debian/rules ] || ln -s contrib/Debian debian dpkg-buildpackage -rfakeroot -i -osxpkg: +osxpkg: have-xcodebuild @packagemaker >/dev/null 2>&1; [ $$? -ge 1 ] \ || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2) make clean diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 0b5a141..9fd2dfc 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -12,7 +12,9 @@ */ #define PACKAGE_NAME "ngircd" +#ifndef VERSION #define VERSION "??" +#endif #define SYSCONFDIR "/etc/ngircd" #ifndef TARGET_VENDOR