diff options
author | Günther Deschner <gd@samba.org> | 2007-12-12 18:14:54 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2007-12-21 15:29:10 +0100 |
commit | 749f699f871831e9ad5b2a57e498a32f959d23c6 (patch) | |
tree | 295628c36fedf1a8cce0dbeeb699184fab29d330 /source3/Makefile.in | |
parent | 5799dcdfed85c6e0d481b6ce5a6ddead576763e9 (diff) | |
download | samba-749f699f871831e9ad5b2a57e498a32f959d23c6.tar.gz samba-749f699f871831e9ad5b2a57e498a32f959d23c6.tar.xz samba-749f699f871831e9ad5b2a57e498a32f959d23c6.zip |
Build fixes for libnetapi.
Guenther
(This used to be commit 07d33557b95106ac57fdef8c767ab86192930a6d)
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 765c705d861..9cd035ae718 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -705,7 +705,14 @@ REG_API_OBJ = registry/reg_api.o \ $(UTIL_REG_API_OBJ) \ $(UTIL_REG_SMBCONF_OBJ) -NETAPI_OBJ = lib/netapi/joindomain.o + +LIBNETAPI_OBJ1 = lib/netapi/netapi.o lib/netapi/joindomain.o +LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \ + $(REG_API_OBJ) \ + $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ + $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ + $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \ + $(SECRETS_OBJ) $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) LIBNET_OBJ = libnet/libnet_conf.o libnet/libnet_join.o @@ -728,7 +735,7 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \ $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \ $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \ - $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(NETAPI_OBJ) $(LIBNET_OBJ) + $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) @@ -1355,15 +1362,15 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBADDNS_OBJ) -bin/netapi.@SHLIBEXT@: $(BINARY_PREREQS) $(NETAPI_OBJ) +bin/libnetapi.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @echo Linking shared library $@ - @$(SHLD_DSO) $(NETAPI_OBJ) $(LIBS) \ + @$(SHLD_DSO) $(LIBNETAPI_OBJ) $(LIBS) \ $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) -bin/netapi.a: $(BINARY_PREREQS) $(NETAPI_OBJ) +bin/libnetapi.a: $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(NETAPI_OBJ) + @-$(AR) -rc $@ $(LIBNETAPI_OBJ) bin/libsmbclient.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @echo Linking shared library $@ |