summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-07-19 21:02:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:16 -0500
commit518c4877dda0651c2ddf35ee37c29f97675b37b4 (patch)
tree8f80c3b9b6865a6202dbc9a9828b9edfdb0ceed2 /source3
parent9f6fb43eeefb18578040a0f3b5af941460ec5ca9 (diff)
downloadsamba-518c4877dda0651c2ddf35ee37c29f97675b37b4.tar.gz
samba-518c4877dda0651c2ddf35ee37c29f97675b37b4.tar.bz2
samba-518c4877dda0651c2ddf35ee37c29f97675b37b4.zip
r17151: revert a few accidental commits to the Makefile
(This used to be commit 3fea233802dd2f6a5528fdb183a2ff30d572020d)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 56c7e7c6db..72e5fd3fe5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -39,7 +39,6 @@ IDMAP_LIBS=@IDMAP_LIBS@
KRB5LIBS=@KRB5_LIBS@
LDAP_LIBS=@LDAP_LIBS@
NSCD_LIBS=@NSCD_LIBS@
-UUID_LIBS=@UUID_LIBS@
INSTALLCMD=@INSTALL@
INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@
@@ -573,7 +572,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_domain.o utils/net_help.o \
utils/net_rpc_service.o utils/net_rpc_registry.o utils/net_usershare.o \
utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
- utils/passwd_util.o utils/net_dns.o
+ utils/passwd_util.o
NET_OBJ = $(NET_OBJ1) $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
$(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
@@ -935,7 +934,7 @@ bin/smbctool@EXEEXT@: $(TOOL_OBJ) @BUILD_POPT@ bin/.dummy
bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
- @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS)
+ @$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS)
bin/profiles@EXEEXT@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@