summaryrefslogtreecommitdiff
path: root/source3/Makefile.in
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-12-06 18:49:39 -0800
committerJeremy Allison <jra@samba.org>2007-12-06 18:49:39 -0800
commit9fdf2d05867e5d6abd9099996b9e6c071bdbd0e7 (patch)
tree85fc8c753c9fc8a6e60a5f80b7c0c6d65c7f7fd2 /source3/Makefile.in
parente67a6620a7e5e3edb4a6c285841224bc4173fc44 (diff)
downloadsamba-9fdf2d05867e5d6abd9099996b9e6c071bdbd0e7.tar.gz
samba-9fdf2d05867e5d6abd9099996b9e6c071bdbd0e7.tar.bz2
samba-9fdf2d05867e5d6abd9099996b9e6c071bdbd0e7.zip
Get closer to building with smbmount. Move parameter line changes
into lib/util.c Jeremy. (This used to be commit 6ac5d81655927ba8eabea35adaae5adfcbb821c9)
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r--source3/Makefile.in9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8ab2b9ec34..127a631513 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -687,7 +687,7 @@ TOOL_OBJ = client/smbctool.o client/clitar.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
UTIL_REG_OBJ = lib/util_reg.o
UTIL_REG_API_OBJ = lib/util_reg_api.o
-UTIL_REG_SMBCONF_OBJ = lib/util_reg_smbconf.o
+UTIL_REG_SMBCONF_OBJ = lib/util_reg_smbconf.o
# objects to be used when not all of the registry code should be
# loaded but only the portion needed by reg_api, typically for
@@ -731,16 +731,15 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
$(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(NETAPI_OBJ)
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ)
+ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ)
MOUNT_OBJ = client/smbmount.o \
- $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) \
- $(POPT_LIB_OBJ)
+ $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
MNT_OBJ = client/smbmnt.o $(VERSION_OBJ) $(LIBREPLACE_OBJ) $(POPT_LIB_OBJ) $(SOCKET_WRAPPER_OBJ)
UMOUNT_OBJ = client/smbumount.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ)
+ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
CIFS_MOUNT_OBJ = client/mount.cifs.o