diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-23 12:45:37 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-05-23 15:26:57 +0200 |
| commit | 033edccdaeaabc1bbd31411173f999916abc530b (patch) | |
| tree | 2f5ddb6b86ba410b54a0fb654620d936b98dc8a4 | |
| parent | ce05f183d3719fc5592a850d93a1f785acb8fb30 (diff) | |
| download | samba-033edccdaeaabc1bbd31411173f999916abc530b.tar.gz | |
build: autogenerate exports/libwbclient.syms
metze
(cherry picked from commit 8e0fcd583a643a8f4240698efcbb177463534a82)
| -rw-r--r-- | source/Makefile.in | 16 | ||||
| -rw-r--r-- | source/configure.in | 4 | ||||
| -rw-r--r-- | source/exports/libwbclient.syms | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index bda7b65469b..1cf03ee8096 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -157,7 +157,12 @@ LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@ -LIBWBCLIENT=@LIBWBCLIENT_SHARED@ + +LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@ +LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@ +LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@ +LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@ +LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@ LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@ @@ -1608,13 +1613,16 @@ $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBTDB_OBJ0) -bin/libwbclient.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) @LIBTALLOC_SHARED@ +$(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS) + @$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS) + +$(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) @LIBTALLOC_LIBS@ $(LIBWBCLIENT_OBJ) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @ln -s -f `basename $@` $@.$(SONAME_VER) -bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) +$(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) @@ -2281,7 +2289,7 @@ clean: delheaders $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBNETAPI) \ bin/libwbclient.so.0 bin/timelimit \ .headers.stamp */src/*.o proto_exists \ - $(LIBTALLOC_SYMS) $(LIBTDB_SYMS) $(LIBNETAPI_SYMS) + $(LIBTALLOC_SYMS) $(LIBWBCLIENT_SYMS) $(LIBTDB_SYMS) $(LIBNETAPI_SYMS) -rm -rf t_dir # Making this target will just make sure that the prototype files diff --git a/source/configure.in b/source/configure.in index 0ec0b9f9f5d..3129ee9ebed 100644 --- a/source/configure.in +++ b/source/configure.in @@ -86,7 +86,9 @@ AC_SUBST(LIBADDNS) AC_SUBST(INSTALL_LIBWBCLIENT) AC_SUBST(UNINSTALL_LIBWBCLIENT) +AC_SUBST(LIBWBCLIENT_SHARED_TARGET) AC_SUBST(LIBWBCLIENT_SHARED) +AC_SUBST(LIBWBCLIENT_STATIC_TARGET) AC_SUBST(LIBWBCLIENT_STATIC) AC_SUBST(LIBWBCLIENT) AC_SUBST(WINBIND_LIBS) @@ -5698,12 +5700,14 @@ if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_S NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}" ## Only worry about libwbclient if we have shared library support ## and winbindd + LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT LIBWBCLIENT_SHARED=bin/libwbclient.$SHLIBEXT LIBWBCLIENT=libwbclient INSTALL_LIBWBCLIENT=installlibwbclient UNINSTALL_LIBWBCLIENT=uninstalllibwbclient WINBIND_LIBS="-lwbclient" else + LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a LIBWBCLIENT_STATIC=bin/libwbclient.a fi diff --git a/source/exports/libwbclient.syms b/source/exports/libwbclient.syms deleted file mode 100644 index f1e68b42a94..00000000000 --- a/source/exports/libwbclient.syms +++ /dev/null @@ -1,4 +0,0 @@ -{ - global: wbc*; - local: *; -}; |