ndr_compression: use inflateReset() and inflateSetDictionary() instead of inflateReset2()

[kai/samba-autobuild/.git] / source4 / Makefile

diff --git a/source4/Makefile b/source4/Makefile
index 1889ba2d5eaeb91b4f1e28eedf02dc1eade580bf..d91d08a252b04eb40e4d2ad91827a8ec326d4bd6 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -10,8 +10,6 @@ include mkconfig.mk
 
 pidldir := $(srcdir)/pidl
 
-VPATH = $(builddir):$(srcdir):$(srcdir)/heimdal_build:$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des
-
 BASEDIR = $(prefix)
 TORTUREDIR = $(libdir)/torture
 SWATDIR = $(datadir)/swat
@@ -51,6 +49,7 @@ endif
 
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
+zlibsrcdir := lib/zlib
 dynconfigsrcdir := dynconfig
 heimdalsrcdir := heimdal
 dsdbsrcdir := dsdb
@@ -106,8 +105,6 @@ ntp_signdsrcdir := ntp_signd
 
 include data.mk
 
-BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
-
 pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
 
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
@@ -136,12 +133,11 @@ endif
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
                  $(srcdir)/version.h
 
-binaries:: $(BINARIES)
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)
 headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
 manpages:: $(MANPAGES)
-all:: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules pythonmods libraries headers
+all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
 
 LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
@@ -181,7 +177,7 @@ showflags::
 # The permissions to give the executables
 INSTALLPERMS = 0755
 
-install:: showlayout everything installbin installdat installswat installmisc \
+install:: showlayout everything installbin installsbin installdat installswat installmisc \
              installlib installheader installpc installplugins
 
 # DESTDIR is used here to prevent packagers wasting their time
@@ -202,6 +198,8 @@ installdirs::
                $(DESTDIR)$(modulesdir) \
                $(DESTDIR)$(mandir) \
                $(DESTDIR)$(localstatedir) \
+               $(DESTDIR)$(localstatedir)/lib \
+               $(DESTDIR)$(localstatedir)/run \
                $(DESTDIR)$(privatedir) \
                $(DESTDIR)$(datadir) \
                $(DESTDIR)$(piddir) \
@@ -210,23 +208,9 @@ installdirs::
                $(DESTDIR)$(privatedir)/tls \
                $(DESTDIR)$(includedir) \
                $(DESTDIR)$(PKGCONFIGDIR) \
-               $(DESTDIR)$(sysconfdir) \
+               $(DESTDIR)$(sysconfdir)
 
 installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs
-       @$(SHELL) $(srcdir)/script/installbin.sh \
-               $(INSTALLPERMS) \
-               $(DESTDIR)$(BASEDIR) \
-               $(DESTDIR)$(sbindir) \
-               $(DESTDIR)$(libdir) \
-               $(DESTDIR)$(localstatedir) \
-               $(SBIN_PROGS)
-       @$(SHELL) $(srcdir)/script/installbin.sh \
-               $(INSTALLPERMS) \
-               $(DESTDIR)$(BASEDIR) \
-               $(DESTDIR)$(bindir) \
-               $(DESTDIR)$(libdir) \
-               $(DESTDIR)$(localstatedir) \
-               $(BIN_PROGS)
        @$(SHELL) $(srcdir)/script/installtorture.sh \
                $(INSTALLPERMS) \
                $(DESTDIR)$(TORTUREDIR) \
@@ -263,6 +247,20 @@ uninstall:: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader
 uninstallmisc::
        #FIXME
 
+$(DESTDIR)$(bindir)/%: bin/% installdirs
+       @mkdir -p $(@D)
+       @echo Installing $(@F) as $@
+       @if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
+       @cp $< $@
+       @chmod $(INSTALLPERMS) $@
+
+$(DESTDIR)$(sbindir)/%: bin/% installdirs
+       @mkdir -p $(@D)
+       @echo Installing $(@F) as $@
+       @if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
+       @cp $< $@
+       @chmod $(INSTALLPERMS) $@
+
 uninstallbin::
        @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(SBIN_PROGS)
        @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(BIN_PROGS)
@@ -290,7 +288,8 @@ data.mk: config.status $(MK_FILES)
 testcov-html:: 
 
 include $(pidldir)/config.mk
-include $(srcdir)/selftest/config.mk
+selftestdir := $(srcdir)/selftest
+include $(selftestdir)/config.mk
 
 showflags::
        @echo '  pwd        = '`/bin/pwd`