From f408d58d95f5ac10849742fdcdf7e6160196e8e0 Mon Sep 17 00:00:00 2001 From: Brian Lu Date: Thu, 17 Dec 2009 14:55:57 +0800 Subject: tevent: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details Signed-off-by: Stefan Metzmacher --- lib/tevent/tevent.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk index 694d082c4a..57bfd81222 100644 --- a/lib/tevent/tevent.mk +++ b/lib/tevent/tevent.mk @@ -26,6 +26,10 @@ installheaders:: installdirs installlibs:: installdirs cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig cp $(TEVENT_STLIB) $(TEVENT_SOLIB) $(DESTDIR)$(libdir) + rm -f $(DESTDIR)$(libdir)/$(TEVENT_SONAME) + ln -s $(TEVENT_SOLIB) $(DESTDIR)$(libdir)/$(TEVENT_SONAME) + rm -f $(DESTDIR)$(libdir)/$(TEVENT_SOBASE) + ln -s $(TEVENT_SOLIB) $(DESTDIR)$(libdir)/$(TEVENT_SOBASE) install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET) -- cgit From eff6022d51f578dfc48f1d66dd8ec1e860dfd7b3 Mon Sep 17 00:00:00 2001 From: Brian Lu Date: Thu, 17 Dec 2009 14:48:59 +0800 Subject: talloc: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details Signed-off-by: Stefan Metzmacher --- lib/talloc/talloc.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib') diff --git a/lib/talloc/talloc.mk b/lib/talloc/talloc.mk index a563d613d6..fc90f4d41e 100644 --- a/lib/talloc/talloc.mk +++ b/lib/talloc/talloc.mk @@ -1,5 +1,6 @@ TALLOC_OBJ = $(tallocdir)/talloc.o +TALLOC_SHLIB = libtalloc.$(SHLIBEXT) TALLOC_SOLIB = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION) TALLOC_SONAME = libtalloc.$(SHLIBEXT).$(TALLOC_VERSION_MAJOR) TALLOC_STLIB = libtalloc.a @@ -25,6 +26,10 @@ install:: all if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true + rm -f $(DESTDIR)$(libdir)/$(TALLOC_SONAME) + ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SONAME) + rm -f $(DESTDIR)$(libdir)/$(TALLOC_SHLIB) + ln -s $(TALLOC_SOLIB) $(DESTDIR)$(libdir)/$(TALLOC_SHLIB) doc:: talloc.3 talloc.3.html -- cgit From 0a3a6bb8f910df02cb429fdeacf0ab8d683e0b89 Mon Sep 17 00:00:00 2001 From: Brian Lu Date: Thu, 17 Dec 2009 14:39:09 +0800 Subject: tdb: create symbol links to shared libraries see https://bugzilla.samba.org/show_bug.cgi?id=6991 for details Signed-off-by: Stefan Metzmacher --- lib/tdb/tdb.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk index 93aa899480..3bda884af4 100644 --- a/lib/tdb/tdb.mk +++ b/lib/tdb/tdb.mk @@ -91,6 +91,10 @@ installheaders:: installdirs installlibs:: all installdirs cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir) + rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) + ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) + rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME) + ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME) $(TDB_STLIB): $(TDB_OBJ) ar -rv $(TDB_STLIB) $(TDB_OBJ) -- cgit From c01f443ebca5e0b6f65fe8b3ab031da51dce2e89 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 6 Jan 2010 14:39:43 +0100 Subject: tdb: fix standalone 'make installdocs' metze --- lib/tdb/Makefile.in | 1 + lib/tdb/tdb.mk | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/tdb/Makefile.in b/lib/tdb/Makefile.in index 3abeec3258..dc22ee3fea 100644 --- a/lib/tdb/Makefile.in +++ b/lib/tdb/Makefile.in @@ -9,6 +9,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ +mandir = @mandir@ VPATH = @srcdir@:@libreplacedir@ srcdir = @srcdir@ builddir = @builddir@ diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk index 3bda884af4..ecc6f9fd08 100644 --- a/lib/tdb/tdb.mk +++ b/lib/tdb/tdb.mk @@ -61,9 +61,9 @@ doc:: manpages/tdbbackup.8 manpages/tdbdump.8 manpages/tdbtool.8 -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< installdocs:: - ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1 - for I in manpages/*.1; do \ - ${INSTALLCMD} -m 644 $$I $(DESTDIR)$(mandir)/man1 \ + ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man8 + for I in manpages/*.8; do \ + ${INSTALLCMD} -m 644 $$I $(DESTDIR)$(mandir)/man8; \ done install-python:: build-python -- cgit From 571ee54b791b93ad46e09ed563ef4a5582dcf0c8 Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Thu, 7 Jan 2010 00:40:09 +0100 Subject: lib/util: move TIME_T_MIN/MAX defines into header file --- lib/util/time.c | 14 -------------- lib/util/time.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/util/time.c b/lib/util/time.c index eadafe4562..571219b810 100644 --- a/lib/util/time.c +++ b/lib/util/time.c @@ -27,11 +27,6 @@ * @brief time handling functions */ -#ifndef TIME_T_MIN -/* we use 0 here, because (time_t)-1 means error */ -#define TIME_T_MIN 0 -#endif - #if (SIZEOF_LONG == 8) #define TIME_FIXUP_CONSTANT_INT 11644473600L #elif (SIZEOF_LONG_LONG == 8) @@ -40,15 +35,6 @@ -/* - * we use the INT32_MAX here as on 64 bit systems, - * gmtime() fails with INT64_MAX - */ - -#ifndef TIME_T_MAX -#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t)) -#endif - /** External access to time_t_min and time_t_max. **/ diff --git a/lib/util/time.h b/lib/util/time.h index e40de2de3d..cf6dc1caa7 100644 --- a/lib/util/time.h +++ b/lib/util/time.h @@ -23,6 +23,20 @@ #define _PUBLIC_ #endif +#ifndef TIME_T_MIN +/* we use 0 here, because (time_t)-1 means error */ +#define TIME_T_MIN 0 +#endif + +/* + * we use the INT32_MAX here as on 64 bit systems, + * gmtime() fails with INT64_MAX + */ +#ifndef TIME_T_MAX +#define TIME_T_MAX MIN(INT32_MAX,_TYPE_MAXIMUM(time_t)) +#endif + + /* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */ typedef uint64_t NTTIME; -- cgit