summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-07 11:59:10 +0200
committerMichael Adam <obnox@samba.org>2008-07-07 20:34:02 +0200
commit5df4ca43ebd6a382db6744ddd7ba99ebfa388883 (patch)
tree2ae140d3fd5d6d77821aebf40755b2f890d0e718
parent672eb71cf7b43e53379ed8e1c67ce082d2eae9d6 (diff)
downloadsamba-5df4ca43ebd6a382db6744ddd7ba99ebfa388883.tar.gz
samba-5df4ca43ebd6a382db6744ddd7ba99ebfa388883.tar.bz2
samba-5df4ca43ebd6a382db6744ddd7ba99ebfa388883.zip
build: move libaddns related bits to the libaddns section in Makefile.in
Michael (This used to be commit 61157cb92ec2c12e565fb088170c7f430e3b5b77)
-rw-r--r--source3/Makefile.in32
1 files changed, 16 insertions, 16 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 97717869d9..2050a5eebc 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -143,8 +143,6 @@ CODEPAGEDIR = @codepagedir@
# the directory where pid files go
PIDDIR = @piddir@
-LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
-
FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS)
FLAGS2 =
FLAGS3 =
@@ -345,10 +343,6 @@ PARAM_OBJ = $(PARAM_WITHOUT_REG_OBJ) $(PARAM_REG_ADD_OBJ)
KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o
-LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
- libaddns/dnsgss.o libaddns/dnsmarshall.o
-LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
-
GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
@@ -1723,7 +1717,11 @@ uninstalllibwbclient::
#
#-------------------------------------------------------------------
-libaddns: $(LIBADDNS)
+LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \
+ libaddns/dnsgss.o libaddns/dnsmarshall.o
+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@
+
+LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@
bin/libaddns.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@
@echo Linking shared library $@
@@ -1735,6 +1733,17 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
@echo Linking non-shared library $@
@-$(AR) -rc $@ $(LIBADDNS_OBJ)
+libaddns: $(LIBADDNS)
+
+installlibaddns:: installdirs libaddns
+ @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+ -$(INSTALLLIBCMD_SH) bin/libaddns.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
+ -$(INSTALLLIBCMD_A) bin/libaddns.a $(DESTDIR)$(LIBDIR)
+
+uninstalllibaddns::
+ -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libaddns.@SHLIBEXT@
+ -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libaddns.a
+
#-------------------------------------------------------------------
#
@@ -2441,11 +2450,6 @@ installmsg:: installdirs
installswat:: installdirs installmsg
@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-installlibaddns:: installdirs libaddns
- @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
- -$(INSTALLLIBCMD_SH) bin/libaddns.@SHLIBEXT@ $(DESTDIR)$(LIBDIR)
- -$(INSTALLLIBCMD_A) bin/libaddns.a $(DESTDIR)$(LIBDIR)
-
installpammodules:: $(PAM_MODULES)
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(PAMMODULESDIR)
@for module in $(PAM_MODULES); do \
@@ -2517,10 +2521,6 @@ uninstallmsg::
uninstallswat:: uninstallmsg
@$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-uninstalllibaddns::
- -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libaddns.@SHLIBEXT@
- -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libaddns.a
-
uninstallpammodules::
@for module in $(PAM_MODULES); do \
echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@ "; \