summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-06 13:02:40 +0200
committerMichael Adam <obnox@samba.org>2008-07-07 20:33:59 +0200
commit435137c16b6d278dac6aa3350cf5b0a58df5cc36 (patch)
tree4148385f2a121eefadccaf51b255ae73cf6ed039 /source3
parent04275114668c45c72cbe4d81f13d63115fea1e1b (diff)
downloadsamba-435137c16b6d278dac6aa3350cf5b0a58df5cc36.tar.gz
samba-435137c16b6d278dac6aa3350cf5b0a58df5cc36.tar.bz2
samba-435137c16b6d278dac6aa3350cf5b0a58df5cc36.zip
build: move all libtalloc related definitions into the libtalloc section in Makefile.in
Michael (This used to be commit b330892f4b2f9f50fd192e37720217d15fedf1f0)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in27
1 files changed, 13 insertions, 14 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 091afebee5..64f42c6ee7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -143,14 +143,6 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
-LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
-LIBTALLOC_SHARED_SOVER=$(shell grep \^$(LIBTALLOC_SHARED_TARGET) $(builddir)/library-versions | cut -d: -f2)
-LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SHARED_SOVER)
-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@
LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@
@@ -330,12 +322,6 @@ LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
-TALLOC_OBJ = @TALLOC_OBJS@
-
-
-LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
-LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
-
LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
$(LIBREPLACE_OBJ) \
$(SOCKET_WRAPPER_OBJ) \
@@ -1623,6 +1609,19 @@ shlibs: $(SHLIBS)
#
#-------------------------------------------------------------------
+TALLOC_OBJ = @TALLOC_OBJS@
+
+LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
+LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
+
+LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
+LIBTALLOC_SHARED_SOVER=$(shell grep \^$(LIBTALLOC_SHARED_TARGET) $(builddir)/library-versions | cut -d: -f2)
+LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SHARED_SOVER)
+LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
+LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@
+LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@
+LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
+
$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)