diff options
author | Stefan Metzmacher <metze@samba.org> | 2008-09-14 19:18:12 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2008-09-14 19:18:12 +0200 |
commit | 0143c320ccf21c00e1a09b8363cd42724b76faf9 (patch) | |
tree | 6c528ff3d421e9513ffbbc83be852df35f05f164 | |
parent | 60f7bdac64e32ea39099ababacca6f8a2b780ecb (diff) | |
download | samba-0143c320ccf21c00e1a09b8363cd42724b76faf9.tar.gz |
lib/talloc: sync build system changes from samba4
metze
-rw-r--r-- | source/lib/talloc/Makefile.in | 5 | ||||
-rw-r--r-- | source/lib/talloc/NEWS | 13 | ||||
-rw-r--r-- | source/lib/talloc/config.mk | 11 | ||||
-rw-r--r-- | source/lib/talloc/configure.ac | 1 | ||||
-rw-r--r-- | source/lib/talloc/talloc.mk | 10 |
5 files changed, 27 insertions, 13 deletions
diff --git a/source/lib/talloc/Makefile.in b/source/lib/talloc/Makefile.in index 851dc81aeab..07b8fd4ff0f 100644 --- a/source/lib/talloc/Makefile.in +++ b/source/lib/talloc/Makefile.in @@ -17,6 +17,7 @@ EXTRA_TARGETS = @DOC_TARGET@ PICFLAG = @PICFLAG@ PACKAGE_VERSION = @PACKAGE_VERSION@ SHLIBEXT = @SHLIBEXT@ +SHLD = @SHLD@ SHLD_FLAGS = @SHLD_FLAGS@ tallocdir = @tallocdir@ @@ -27,8 +28,8 @@ all:: showflags $(EXTRA_TARGETS) include $(tallocdir)/rules.mk include $(tallocdir)/talloc.mk -$(SOLIB): $(LIBOBJ) - $(CC) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(SONAME) +$(TALLOC_SOLIB): $(LIBOBJ) + $(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) @SONAMEFLAG@$(TALLOC_SONAME) check: test diff --git a/source/lib/talloc/NEWS b/source/lib/talloc/NEWS new file mode 100644 index 00000000000..e5b3aa0731c --- /dev/null +++ b/source/lib/talloc/NEWS @@ -0,0 +1,13 @@ +1.0.1 26 May 2007 + + BUGS + + * Set name of correctly when using talloc_append_string() (metze) + + LICENSE + + * Change license of files in lib/replace to LGPL (was GPL). (jelmer) + +1.0.0 30 April 2007 + + Initial release. diff --git a/source/lib/talloc/config.mk b/source/lib/talloc/config.mk index 540a05d100b..c13e1b79abd 100644 --- a/source/lib/talloc/config.mk +++ b/source/lib/talloc/config.mk @@ -1,8 +1,7 @@ [LIBRARY::LIBTALLOC] -VERSION = 1.2.0 -SO_VERSION = 1 -OBJ_FILES = talloc.o -PC_FILE = talloc.pc -MANPAGE = talloc.3 +OUTPUT_TYPE = MERGED_OBJ CFLAGS = -Ilib/talloc -PUBLIC_HEADERS = talloc.h + +LIBTALLOC_OBJ_FILES = lib/talloc/talloc.o + +MANPAGES += $(tallocdir)/talloc.3 diff --git a/source/lib/talloc/configure.ac b/source/lib/talloc/configure.ac index 3dcf74ba255..4719aa04b59 100644 --- a/source/lib/talloc/configure.ac +++ b/source/lib/talloc/configure.ac @@ -18,6 +18,7 @@ AC_SUBST(DOC_TARGET) AC_LD_PICFLAG AC_LD_SHLIBEXT AC_LD_SONAMEFLAG +AC_LIBREPLACE_SHLD AC_LIBREPLACE_SHLD_FLAGS AC_OUTPUT(Makefile talloc.pc) diff --git a/source/lib/talloc/talloc.mk b/source/lib/talloc/talloc.mk index 590adc74f27..e1fe88c84b6 100644 --- a/source/lib/talloc/talloc.mk +++ b/source/lib/talloc/talloc.mk @@ -1,9 +1,9 @@ TALLOC_OBJ = $(tallocdir)/talloc.o -SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION) -SONAME = libtalloc.$(SHLIBEXT).1 +TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(PACKAGE_VERSION) +TALLOC_SONAME = libtalloc.$(SHLIBEXT).1 -all:: libtalloc.a $(SOLIB) testsuite +all:: libtalloc.a $(TALLOC_SOLIB) testsuite testsuite:: $(LIBOBJ) testsuite.o $(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS) @@ -16,7 +16,7 @@ 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} -m 755 $(TALLOC_SOLIB) $(DESTDIR)$(libdir) ${INSTALLCMD} -d $(DESTDIR)${includedir} ${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir) ${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig @@ -28,7 +28,7 @@ install:: all doc:: talloc.3 talloc.3.html clean:: - rm -f *~ $(LIBOBJ) $(SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html + rm -f *~ $(LIBOBJ) $(TALLOC_SOLIB) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html test:: testsuite ./testsuite |