summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-06 20:11:50 +0200
committerMichael Adam <obnox@samba.org>2008-07-07 20:34:00 +0200
commit4cc6a590412c547fc17f9b575f7cd8037d59067c (patch)
tree440e64ca0a0bc728b8ddb08ca76fb29dce9304e2 /source3
parent31a4a4ec8141756107e05e7b9d6300c92f3f0167 (diff)
downloadsamba-4cc6a590412c547fc17f9b575f7cd8037d59067c.tar.gz
samba-4cc6a590412c547fc17f9b575f7cd8037d59067c.tar.bz2
samba-4cc6a590412c547fc17f9b575f7cd8037d59067c.zip
build: move libnetapi related definitions and targets together into the libnetapi section.
in Makefile.in Michael (This used to be commit da29e1ce44d4f99b876259fbad892691e2c7d7e0)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in69
1 files changed, 35 insertions, 34 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c6f560cd26..34424d1903 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -153,12 +153,6 @@ 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@
-LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) @LIBNETAPI_SHARED@
-LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.@SYMSEXT@
-LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
-
FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
FLAGS2 =
FLAGS3 =
@@ -837,27 +831,6 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
$(DISPLAY_SEC_OBJ)
-LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
- lib/netapi/cm.o \
- librpc/gen_ndr/ndr_libnetapi.o \
- lib/netapi/libnetapi.o \
- lib/netapi/joindomain.o \
- lib/netapi/serverinfo.o \
- lib/netapi/getdc.o \
- lib/netapi/user.o \
- lib/netapi/group.o \
- lib/netapi/localgroup.o \
- lib/netapi/samr.o
-
-LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
- $(LIBSMBCONF_OBJ) \
- $(REG_SMBCONF_OBJ) \
- $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
- $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
-
LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
lib/smbconf/smbconf_reg.o \
lib/smbconf/smbconf_txt.o \
@@ -1764,7 +1737,32 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
#
#-------------------------------------------------------------------
-libnetapi: $(LIBNETAPI)
+LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
+ lib/netapi/cm.o \
+ librpc/gen_ndr/ndr_libnetapi.o \
+ lib/netapi/libnetapi.o \
+ lib/netapi/joindomain.o \
+ lib/netapi/serverinfo.o \
+ lib/netapi/getdc.o \
+ lib/netapi/user.o \
+ lib/netapi/group.o \
+ lib/netapi/localgroup.o \
+ lib/netapi/samr.o
+
+LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
+ $(LIBSMBCONF_OBJ) \
+ $(REG_SMBCONF_OBJ) \
+ $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
+ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+ $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+ $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
+
+LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
+LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
+LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) @LIBNETAPI_SHARED@
+LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.@SYMSEXT@
+LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
$(LIBNETAPI_SYMS): $(LIBNETAPI_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBNETAPI_HEADERS)
@@ -1781,6 +1779,15 @@ $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1)
@echo Linking non-shared library $@
@-$(AR) -rc $@ $(LIBNETAPI_OBJ1)
+libnetapi: $(LIBNETAPI)
+
+installlibnetapi:: installdirs libnetapi
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
+ -$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include
+
+
#-------------------------------------------------------------------
#
# libsmbclient
@@ -2322,12 +2329,6 @@ installlibwbclient:: installdirs libwbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include
-installlibnetapi:: installdirs libnetapi
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
- -$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
- -$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
- -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include
-
installpammodules:: $(PAM_MODULES)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(PAMMODULESDIR)
@for module in $(PAM_MODULES); do \