about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2009-01-06 16:01:52 +0100
committerAlexander Barton <alex@barton.de>2009-01-06 16:02:27 +0100
commit5468ba37446a85bfb8a84eed74bf6c091156f682 (patch)
tree05e92ed4bb0db3cc985cf55dbf170a63867f7779
parenteb159e0a8d38449c10680cf3ed747fdb5c5adbc8 (diff)
downloadngircd-5468ba37446a85bfb8a84eed74bf6c091156f682.tar.gz
ngircd-5468ba37446a85bfb8a84eed74bf6c091156f682.zip
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.
-rw-r--r--Makefile.am15
-rw-r--r--contrib/MacOSX/config.h2
2 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 701bf6b4..0fd06222 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 0b5a141b..9fd2dfcf 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