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

tridge at samba.org tridge at samba.org
Mon May 16 01:17:45 GMT 2005


Author: tridge
Date: 2005-05-16 01:17:44 +0000 (Mon, 16 May 2005)
New Revision: 6802

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

Log:
- fixed CFLAGS

- don't fail if we don't have xsltproc

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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2005-05-16 00:12:39 UTC (rev 6801)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2005-05-16 01:17:44 UTC (rev 6802)
@@ -1,4 +1,3 @@
-OPT = -O
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 includedir = @includedir@
@@ -7,9 +6,8 @@
 XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
+CFLAGS=@CFLAGS@
 
-CFLAGS = $(OPT)
-
 LIBOBJ = talloc.o
 
 all: libtalloc.a testsuite 
@@ -26,15 +24,15 @@
 	${INSTALLCMD} -m 644 talloc.h $(includedir)
 	${INSTALLCMD} -m 644 talloc.pc $(libdir)/pkgconfig
 	${INSTALLCMD} -d ${mandir}/man3
-	${INSTALLCMD} -m 644 talloc.3 $(mandir)/man3
+	test -z "$(XSLTPROC)" || ${INSTALLCMD} -m 644 talloc.3 $(mandir)/man3
 
 doc: talloc.3
 
 %.3: %.3.xml
-	$(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 %.html: %.xml
-	$(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
+	test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 
 clean:
 	rm -f *~ *.o testsuite *.gc??



More information about the samba-cvs mailing list