svn commit: samba r14587 - in branches/SAMBA_4_0/source/lib/talloc: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-20 20:53:00 +0000 (Mon, 20 Mar 2006)
New Revision: 14587

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14587

Log:
Allow building without GNU make and/or without xsltproc

Modified:
   branches/SAMBA_4_0/source/lib/talloc/
   branches/SAMBA_4_0/source/lib/talloc/Makefile.in
   branches/SAMBA_4_0/source/lib/talloc/configure.in


Changeset:

Property changes on: branches/SAMBA_4_0/source/lib/talloc
___________________________________________________________________
Name: svn:ignore
   - *.d
Makefile
config.cache
config.h.in
*.log
*.a
config.status
configure
testsuite
*.3
autom4te.cache
talloc.pc
config.h

   + *.3.html
*.d
Makefile
config.cache
config.h.in
*.log
*.a
config.status
configure
testsuite
*.3
autom4te.cache
talloc.pc
config.h


Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2006-03-20 20:04:04 UTC (rev 14586)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2006-03-20 20:53:00 UTC (rev 14587)
@@ -7,17 +7,20 @@
 INSTALLCMD = @INSTALL@
 CC = @CC@
 CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H=
+EXTRA_TARGETS = @DOC_TARGET@
 
+.SUFFIXES: .c .o .3 .3.xml .xml .html
+
 LIBOBJ = talloc.o
 
-all: libtalloc.a testsuite 
+all: libtalloc.a testsuite $(EXTRA_TARGETS)
 
 testsuite: $(LIBOBJ) testsuite.o
 	$(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS)
 
 libtalloc.a: libtalloc.a($(LIBOBJ))
 
-install: all doc
+install: all 
 	${INSTALLCMD} -d ${libdir}
 	${INSTALLCMD} -m 755 libtalloc.a $(libdir)
 	${INSTALLCMD} -d ${includedir}
@@ -28,10 +31,10 @@
 
 doc: talloc.3
 
-%.3: %.3.xml
+.3.xml.3:
 	test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-%.html: %.xml
+.xml.html:
 	test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 
 clean:

Modified: branches/SAMBA_4_0/source/lib/talloc/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.in	2006-03-20 20:04:04 UTC (rev 14586)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.in	2006-03-20 20:53:00 UTC (rev 14587)
@@ -6,6 +6,11 @@
 fi
 AC_PROG_INSTALL
 AC_PATH_PROG(XSLTPROC,xsltproc)
+DOC_TARGET=""
+if test -n "$XSLTPROC"; then
+	DOC_TARGET=doc
+fi
+AC_SUBST(DOC_TARGET)
 AC_CONFIG_HEADER(config.h)
 sinclude(config.m4)
 AC_OUTPUT(Makefile talloc.pc)