summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-06 22:08:28 +0200
committerMichael Adam <obnox@samba.org>2008-07-07 20:34:01 +0200
commit1920e603fcd8932bffb0e8dd58960df2ed7c76e0 (patch)
tree251f3f4f53a4f592677dda6483ce14776ca59038
parent1778ebf8e369a41440f66d68697045d97ec40d81 (diff)
downloadsamba-1920e603fcd8932bffb0e8dd58960df2ed7c76e0.tar.gz
samba-1920e603fcd8932bffb0e8dd58960df2ed7c76e0.tar.bz2
samba-1920e603fcd8932bffb0e8dd58960df2ed7c76e0.zip
build: move libsmbclient related variables and targets to libsmbclient section
Michael (This used to be commit ed3c35d307456601ca00d88a5cc278d6604681e1)
-rw-r--r--source3/Makefile.in69
1 files changed, 35 insertions, 34 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 044a666c4c..ae26ce1e9c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -143,7 +143,6 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
-LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@
LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
@@ -769,26 +768,6 @@ 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 \
- $(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_OBJ0) @LIBWBCLIENT_STATIC@
-
LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o @LIBTDB_STATIC@
# This shared library is intended for linking with unit test programs
@@ -1847,7 +1826,27 @@ uninstalllibnetapi::
#
#-------------------------------------------------------------------
-libsmbclient: $(LIBSMBCLIENT)
+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 \
+ $(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_OBJ0) @LIBWBCLIENT_STATIC@
+
+LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
bin/libsmbclient.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking shared library $@
@@ -1860,6 +1859,20 @@ bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
@echo Linking non-shared library $@
@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
+libsmbclient: $(LIBSMBCLIENT)
+
+installclientlib:: installdirs libsmbclient
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
+ -$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+ -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
+
+uninstallclientlib::
+ -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libsmbclient.@SHLIBEXT@
+ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbclient.a
+ -rm -f $(DESTDIR)${prefix}/include/libsmbclient.h
+
#-------------------------------------------------------------------
#
@@ -2358,13 +2371,6 @@ installmsg:: installdirs
installswat:: installdirs installmsg
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-installclientlib:: installdirs libsmbclient
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
- -$(INSTALLLIBCMD_SH) bin/libsmbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
- -$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
- -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
-
installlibsmbsharemodes:: installdirs libsmbsharemodes
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) bin/libsmbsharemodes.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
@@ -2447,11 +2453,6 @@ uninstallmsg::
uninstallswat:: uninstallmsg
@$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-uninstallclientlib::
- -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libsmbclient.@SHLIBEXT@
- -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbclient.a
- -rm -f $(DESTDIR)${prefix}/include/libsmbclient.h
-
uninstalllibsmbsharemodes::
-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libsmbsharemodes.@SHLIBEXT@
-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbsharemodes.a