Module: ngircd.git Branch: master Commit: dd7d64f577633d68a11b6dc0e97ec00df0645343 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dd7d6...

Author: Alexander Barton alex@barton.de Date: Thu May 12 00:21:18 2011 +0200

Mac OS X: split up make targets

New targets are: "have-packagemaker", "osxpkg-dest"

---

.gitignore | 1 + Makefile.am | 28 +++++++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore index 96642fb..1990041 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ debian depcomp install-sh missing +ngircd.dest .deps *.a *.o diff --git a/Makefile.am b/Makefile.am index e1d8d60..58f202c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2010 Alexander Barton (alex@barton.de) +# Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,6 +37,10 @@ have-xcodebuild: >/dev/null 2>&1 \ || ( echo; echo "Error: "xcodebuild" not found!"; echo; exit 1 )

+have-packagemaker: + @packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \ + || ( echo; echo "Error: "packagemaker" not found!"; echo; exit 2) + xcode: have-xcodebuild rel=`git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'`; \ def="GCC_PREPROCESSOR_DEFINITIONS="VERSION=\"$$rel\"""; \ @@ -55,10 +59,15 @@ deb: [ -f debian/rules ] || ln -s contrib/Debian debian dpkg-buildpackage -rfakeroot -i

-osxpkg: have-xcodebuild - @packagemaker >/dev/null 2>&1; [ $$? -le 1 ] \ - || ( echo; echo "Error: "packagemaker" not found!"; echo; exit 2) - make clean +osxpkg: have-packagemaker osxpkg-dest + cd contrib/MacOSX && packagemaker \ + --doc ngIRCd.pmdoc \ + --out ../../$(distdir).mpkg + rm -f $(distdir).mpkg.zip + zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg + rm -rf ngircd.dest $(distdir).mpkg + +osxpkg-dest: have-xcodebuild clean ./configure --prefix=/opt/ngircd make xcode make -C contrib/MacOSX de.barton.ngircd.plist @@ -71,11 +80,8 @@ osxpkg: have-xcodebuild rm ngircd.dest/opt/ngircd/etc/ngircd.conf echo "Have a nice day IRCing!" >ngircd.dest/opt/ngircd/etc/ngircd.motd chmod -R a-s,og-w,a+rX ngircd.dest - cd contrib/MacOSX && packagemaker \ - --doc ngIRCd.pmdoc \ - --out ../../$(distdir).mpkg - rm -f $(distdir).mpkg.zip - zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg - rm -rf ngircd.dest $(distdir).mpkg + +.PHONY: deb have-packagemaker have-xcodebuild lint osxpkg osxpkg-dest rpm \ + srcdoc testsuite xcode xcode-clean

# -eof-