diff options
| -rw-r--r-- | source3/Makefile.in | 15 | ||||
| -rw-r--r-- | source3/exports/libtalloc.syms | 6 |
2 files changed, 10 insertions, 11 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 56aa92461b..565927bce9 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -146,6 +146,8 @@ PIDDIR = @piddir@ LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@ LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@ LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@ +LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@ +LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@ LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@ @@ -1604,7 +1606,12 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @WINBIND_LIBS@ -$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) +MKSYMS_SH = $(srcdir)/script/mksyms.sh + +$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS) + @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS) + +$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS) @echo Linking shared library $@ @$(SHLD_DSO) $(LIBTALLOC_OBJ) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @@ -1614,8 +1621,6 @@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBTALLOC_OBJ0) -MKSYMS_SH = $(srcdir)/script/mksyms.sh - $(LIBTDB_SYMS): $(LIBTDB_HEADERS) @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS) @@ -2178,7 +2183,7 @@ installlibtalloc:: installdirs libtalloc -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR) -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/@tallocdir@/talloc.h $(DESTDIR)${prefix}/include + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include installlibtdb:: installdirs libtdb @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) @@ -2322,7 +2327,7 @@ clean:: $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBNETAPI) \ bin/libwbclient.so.0 bin/timelimit \ .headers.stamp */src/*.o \ - $(LIBTDB_SYMS) + $(LIBTALLOC_SYMS) $(LIBTDB_SYMS) $(LIBNETAPI_SYMS) -rm -rf t_dir include/build_env.h: script/build_env.sh diff --git a/source3/exports/libtalloc.syms b/source3/exports/libtalloc.syms deleted file mode 100644 index 87f1c5c63e..0000000000 --- a/source3/exports/libtalloc.syms +++ /dev/null @@ -1,6 +0,0 @@ -{ - global: - talloc_*; - _talloc_*; - local: *; -}; |