diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-08 16:55:52 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-08 16:55:52 +0200 |
| commit | 4b92d2a43ec3d1d95940d1bdedd8afa0ed4df2d4 (patch) | |
| tree | 07d7e894b3b67851cf7eb4180acd06ed4c3a1a6e | |
| parent | 932bc95a13add99b72228cb8e92b093a5c569bce (diff) | |
| download | samba-4b92d2a43ec3d1d95940d1bdedd8afa0ed4df2d4.tar.gz samba-4b92d2a43ec3d1d95940d1bdedd8afa0ed4df2d4.tar.bz2 samba-4b92d2a43ec3d1d95940d1bdedd8afa0ed4df2d4.zip | |
build: fix build of smbget by moving LIBSMBCLIENT_OBJ* defs up again
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
(This used to be commit c4e51f5e761ab23fa08197fa9a52af6db4ab839d)
| -rw-r--r-- | source3/Makefile.in | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index b4264de263..091a6b89e4 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -763,6 +763,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. @@ -1872,28 +1894,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) |