build: fix build of smbget by moving LIBSMBCLIENT_OBJ* defs up again
authorMichael Adam <obnox@samba.org>
Tue, 8 Jul 2008 14:55:52 +0000 (16:55 +0200)
committerKarolin Seeger <kseeger@samba.org>
Mon, 18 Aug 2008 13:02:15 +0000 (15:02 +0200)
to their original place. The problem was that LIBSMCLIENT_OBJ1 is used
in SMBGET_OBJ and that the difinition of LIBSMBCLIENT_OBJ1 was moved
below the bin/smbget target. Somehow it had worked for me.

Thanks to Derrell for pointing that out.

Michael
(cherry picked from commit c4e51f5e761ab23fa08197fa9a52af6db4ab839d)
(cherry picked from commit 2afd72288c54c4a0251cee4c99710bd894cf2b3f)

source/Makefile.in

index e89e6657e6bff241fabbcb574053beab532c2ef6..dbbc831e9132a9b1ca881b08d15f072cdcaf77bb 100644 (file)
@@ -747,6 +747,28 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
                  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
 
+LIBSMBCLIENT_OBJ0 = \
+                   libsmb/libsmb_cache.o \
+                   libsmb/libsmb_compat.o \
+                   libsmb/libsmb_context.o \
+                   libsmb/libsmb_dir.o \
+                   libsmb/libsmb_file.o \
+                   libsmb/libsmb_misc.o \
+                   libsmb/libsmb_path.o \
+                   libsmb/libsmb_printjob.o \
+                   libsmb/libsmb_server.o \
+                   libsmb/libsmb_stat.o \
+                   libsmb/libsmb_xattr.o \
+                   libsmb/libsmb_setget.o
+
+LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
+                   $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+                   $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+                   $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+                   $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
+
+LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
+
 # This shared library is intended for linking with unit test programs
 # to test Samba internals.  It's called libbigballofmud.so to
 # discourage casual usage.
@@ -1848,28 +1870,6 @@ uninstalllibnetapi::
 #
 #-------------------------------------------------------------------
 
-LIBSMBCLIENT_OBJ0 = \
-                   libsmb/libsmb_cache.o \
-                   libsmb/libsmb_compat.o \
-                   libsmb/libsmb_context.o \
-                   libsmb/libsmb_dir.o \
-                   libsmb/libsmb_file.o \
-                   libsmb/libsmb_misc.o \
-                   libsmb/libsmb_path.o \
-                   libsmb/libsmb_printjob.o \
-                   libsmb/libsmb_server.o \
-                   libsmb/libsmb_stat.o \
-                   libsmb/libsmb_xattr.o \
-                   libsmb/libsmb_setget.o
-
-LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
-                   $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
-                   $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-                   $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-                   $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-
-LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-
 LIBSMBCLIENT_SHARED_TARGET=@LIBSMBCLIENT_SHARED_TARGET@
 LIBSMBCLIENT_SOVER=@LIBSMBCLIENT_SOVER@
 LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER)