diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-06 20:44:27 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:34:00 +0200 |
| commit | 6ec6f69d02a711269ace0350be9e50f28664b924 (patch) | |
| tree | 4094671ecc9a415a432a8601bda8923ef6c84821 | |
| parent | 162f9619f4d1169e5f7210b3d7736f17d667c92f (diff) | |
| download | samba-6ec6f69d02a711269ace0350be9e50f28664b924.tar.gz samba-6ec6f69d02a711269ace0350be9e50f28664b924.tar.bz2 samba-6ec6f69d02a711269ace0350be9e50f28664b924.zip | |
build: move libwbclient related target to libwbclient section in Makefile.in
Michael
(This used to be commit 8f64706b095b9ca0e2a8f39cc3133bfd02f86158)
| -rw-r--r-- | source3/Makefile.in | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 3190013c08..c7d66e83bd 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -147,12 +147,6 @@ LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@ -LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@ -LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@ -LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@ -LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@ -LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h - FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) FLAGS2 = FLAGS3 = @@ -359,16 +353,6 @@ LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \ libaddns/dnsgss.o libaddns/dnsmarshall.o LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@ -LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \ - nsswitch/libwbclient/wbc_util.o \ - nsswitch/libwbclient/wbc_pwd.o \ - nsswitch/libwbclient/wbc_idmap.o \ - nsswitch/libwbclient/wbc_sid.o \ - nsswitch/libwbclient/wbc_pam.o -LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \ - $(WBCOMMON_OBJ) \ - @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ) - GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@ LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \ @@ -1697,7 +1681,21 @@ uninstalllibtdb:: # #------------------------------------------------------------------- -libwbclient: $(LIBWBCLIENT) +LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \ + nsswitch/libwbclient/wbc_util.o \ + nsswitch/libwbclient/wbc_pwd.o \ + nsswitch/libwbclient/wbc_idmap.o \ + nsswitch/libwbclient/wbc_sid.o \ + nsswitch/libwbclient/wbc_pam.o +LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \ + $(WBCOMMON_OBJ) \ + @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ) + +LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@ +LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@ +LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@ +LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@ +LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS) @$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS) @@ -1712,6 +1710,15 @@ $(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_O @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ) +libwbclient: $(LIBWBCLIENT) + +installlibwbclient:: installdirs libwbclient + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) + -$(INSTALLLIBCMD_SH) bin/libwbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include + + #------------------------------------------------------------------- # # libaddns @@ -2347,12 +2354,6 @@ installlibaddns:: installdirs libaddns -$(INSTALLLIBCMD_SH) bin/libaddns.@SHLIBEXT@ $(DESTDIR)$(LIBDIR) -$(INSTALLLIBCMD_A) bin/libaddns.a $(DESTDIR)$(LIBDIR) -installlibwbclient:: installdirs libwbclient - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) bin/libwbclient.@SHLIBEXT@ $(DESTDIR)$(LIBDIR) - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include - installpammodules:: $(PAM_MODULES) @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(PAMMODULESDIR) @for module in $(PAM_MODULES); do \ |