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

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-06 19:24:12 +0000 (Tue, 06 Nov 2007)
New Revision: 25882

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

Log:
Build shared library of talloc as well.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/talloc/Makefile.in
   branches/SAMBA_4_0/source/lib/talloc/configure.ac


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2007-11-06 18:58:19 UTC (rev 25881)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2007-11-06 19:24:12 UTC (rev 25882)
@@ -14,13 +14,24 @@
 CC = @CC@
 CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@
 EXTRA_TARGETS = @DOC_TARGET@
+PICFLAG = @PICFLAG@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+SHLIBEXT = @SHLIBEXT@
+SHLD_FLAGS = @SHLD_FLAGS@
+SONAMEFLAG = @SONAMEFLAG@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html
 
 LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@
 
-all: showflags libtalloc.a testsuite $(EXTRA_TARGETS)
+SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION)
+SONAME = libtalloc.$(SHLIBEXT).1
 
+.c.o:
+	$(CC) $(PICFLAG) -o $@ -c $< $(CFLAGS)
+
+all: showflags libtalloc.a $(SOLIB) testsuite $(EXTRA_TARGETS)
+
 showflags:
 	@echo 'talloc will be compiled with flags:'
 	@echo '  CFLAGS = $(CFLAGS)'
@@ -33,10 +44,14 @@
 	ar -rv $@ $(LIBOBJ)
 	@-ranlib $@
 
+$(SOLIB): $(LIBOBJ)
+	$(CC) $(SONAMEFLAG)$(SONAME) $(SHLD_FLAGS) -o $@ $^
+
 install: all 
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
 	${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
 	${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
+	${INSTALLCMD} -m 755 $(SOLIB) $(DESTDIR)$(libdir)
 	${INSTALLCMD} -d $(DESTDIR)${includedir}
 	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
 	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
@@ -52,7 +67,7 @@
 	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 
 clean:
-	rm -f *~ $(LIBOBJ) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
+	rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html
 
 test: testsuite
 	./testsuite

Modified: branches/SAMBA_4_0/source/lib/talloc/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.ac	2007-11-06 18:58:19 UTC (rev 25881)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.ac	2007-11-06 19:24:12 UTC (rev 25882)
@@ -15,4 +15,9 @@
 fi
 AC_SUBST(DOC_TARGET)
 
+AC_LD_PICFLAG
+AC_LD_SHLIBEXT
+AC_LD_SONAMEFLAG
+AC_LD_SHLDFLAGS
+
 AC_OUTPUT(Makefile talloc.pc)