fix/improve build system

- allow to build without linuxdoc
 - remove xca.dmg and xca.app targets
 - fix clean target in doc
This commit is contained in:
Christian Hohnstaedt 2009-11-18 18:54:05 +01:00
parent dbcc1048c1
commit 8f446c205e
3 changed files with 14 additions and 14 deletions

View File

@ -55,6 +55,11 @@ dist: lang doc
git archive --format=tar --prefix=$(TARGET)/ $(TAG) | \
gzip -9 > $(TARGET).tar.gz
snapshot: lang doc
HASH=$$(git rev-parse HEAD) && \
git archive --format=tar --prefix=xca-$${HASH}/ HEAD | \
gzip -9 > xca-$${HASH}.tar.gz
install: xca$(SUFFIX)
install -m 755 -d $(destdir)$(prefix)/$(bindir)
install -m 755 xca $(destdir)$(prefix)/$(bindir)
@ -63,19 +68,6 @@ install: xca$(SUFFIX)
$(MAKE) -C $$d install; \
done
xca.app: xca$(SUFFIX)
rm -rf xca.app
mkdir -p xca.app/Contents/MacOS
mkdir -p xca.app/Contents/Resources
install -m 755 xca xca.app/Contents/MacOS
$(STRIP) xca.app/Contents/MacOS/xca
for d in $(INSTDIR); do \
$(MAKE) -C $$d APPDIR=$(TOPDIR)/xca.app/Contents app; \
done
xca.dmg: xca.app
test -x hdiutil
hdiutil create -ov -srcfolder $< $@
setup.exe: xca$(SUFFIX) misc/xca.nsi doc lang
$(MAKE) -C lang

7
configure vendored
View File

@ -169,6 +169,13 @@ else
err "Unable to compile a minimal application look at 'conftest.log' for errors"
fi
if which linuxdoc 2>&1; then
LINUXDOC="linuxdoc"
else
echo "Application 'linuxdoc' not found. No documentation will be generated"
LINUXDOC=":"
fi
findapp() {
for app in `which $@ 2>/dev/null`; do
if test -x "$app"; then

View File

@ -11,6 +11,7 @@ xca.1.gz: xca.1
gzip -9 <$^ >$@
xca.html: xca.sgml
echo '<h1>No documentation generated</h1>' > $@
$(LINUXDOC) -B html $<
install: xca.1.gz xca.html
@ -20,7 +21,7 @@ install: xca.1.gz xca.html
install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
clean:
$(RM) xca.1.gz
$(RM) xca.1.gz xca*.html
app: xca.html
mkdir -p $(APPDIR)/Resources