diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-20 20:53:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:58:54 -0500 |
| commit | dbbf90d8a27b40f2be948f2ea8355a15252cf384 (patch) | |
| tree | 8af0993602bf47390b6d21772fbcea7a850ba54a | |
| parent | c67c12585071d46a4f3b5f46e567de339077c239 (diff) | |
| download | samba-dbbf90d8a27b40f2be948f2ea8355a15252cf384.tar.gz samba-dbbf90d8a27b40f2be948f2ea8355a15252cf384.tar.bz2 samba-dbbf90d8a27b40f2be948f2ea8355a15252cf384.zip | |
r14587: Allow building without GNU make and/or without xsltproc
(This used to be commit 33709dc5b3652f4d4c7281bec4ba7160a6d87598)
| -rw-r--r-- | source4/lib/talloc/Makefile.in | 11 | ||||
| -rw-r--r-- | source4/lib/talloc/configure.in | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in index f11124e707..083ab449bf 100644 --- a/source4/lib/talloc/Makefile.in +++ b/source4/lib/talloc/Makefile.in @@ -7,17 +7,20 @@ XSLTPROC = @XSLTPROC@ 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 @@ install: all doc 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: diff --git a/source4/lib/talloc/configure.in b/source4/lib/talloc/configure.in index 24a2e4ead6..76d7c74366 100644 --- a/source4/lib/talloc/configure.in +++ b/source4/lib/talloc/configure.in @@ -6,6 +6,11 @@ if test "x$GCC" = "xyes"; then 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) |