Merge branch 'selftest' of git://git.samba.org/jelmer/samba

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

diff --git a/source4/Makefile b/source4/Makefile
index 3630adce56f4b36d8c7019af516c6c891ef194c2..26cab668c80135cc555a8a4bb50aa951b513a6aa 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -10,11 +10,11 @@ include mkconfig.mk
 
 pidldir := $(srcdir)/../pidl
 
-BASEDIR = $(prefix)
-TORTUREDIR = $(libdir)/torture
-SWATDIR = $(datadir)/swat
-SETUPDIR = $(datadir)/setup
-NCALRPCDIR = $(localstatedir)/ncalrpc
+basedir = $(prefix)
+torturedir = $(libdir)/torture
+swatdir = $(datadir)/swat
+setupdir = $(datadir)/setup
+ncalrpcdir = $(localstatedir)/ncalrpc
 
 BNLD = $(LD)
 BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
@@ -48,7 +48,7 @@ endif
 
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
-zlibsrcdir := lib/zlib
+zlibsrcdir := ../lib/zlib
 dynconfigsrcdir := dynconfig
 heimdalsrcdir := heimdal
 dsdbsrcdir := dsdb
@@ -74,7 +74,7 @@ socketwrappersrcdir := ../lib/socket_wrapper
 nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
-libutilsrcdir := lib/util
+libutilsrcdir := ../lib/util
 libtdrsrcdir := lib/tdr
 libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := ../lib/crypto
@@ -97,7 +97,7 @@ ntvfssrcdir := ntvfs
 ntptrsrcdir := ntptr
 librpcsrcdir := librpc
 libclisrcdir := libcli
-libclinbtsrcdir := ../libcli
+libclinbtsrcdir := ../libcli/nbt
 pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
 ntp_signdsrcdir := ntp_signd
@@ -107,6 +107,15 @@ comsrcdir := $(srcdir)/lib/com
 
 include data.mk
 
+$(foreach SCRIPT,$(wildcard scripting/bin/*),$(eval $(call binary_install_template,$(SCRIPT))))
+
+$(DESTDIR)$(bindir)/%: scripting/bin/% installdirs
+       @mkdir -p $(@D)
+       @echo Installing $(@F) as $@
+       @if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
+       @cp $< $@
+       @chmod $(INSTALLPERMS) $@
+
 pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
 
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
@@ -132,7 +141,10 @@ else
 include $(srcdir)/static_deps.mk
 endif
 
-DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
+clean::
+       @find ../lib ../libcli -name '*.o' -o -name '*.ho' | xargs rm -f
+
+DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
                  $(srcdir)/version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
@@ -152,7 +164,7 @@ testsuite:: bin/smbclient bin/cifsdd bin/smbtorture bin/nmblookup
 
 showlayout:: 
        @echo 'Samba will be installed into:'
-       @echo '  basedir:     $(BASEDIR)'
+       @echo '  basedir:     $(basedir)'
        @echo '  bindir:      $(bindir)'
        @echo '  sbindir:     $(sbindir)'
        @echo '  libdir:      $(libdir)'
@@ -163,10 +175,10 @@ showlayout::
        @echo '  piddir:      $(piddir)'
        @echo '  lockdir:     $(lockdir)'
        @echo '  logfilebase: $(logfilebase)'
-       @echo '  setupdir:    $(SETUPDIR)'
-       @echo '  swatdir:     $(SWATDIR)'
+       @echo '  setupdir:    $(setupdir)'
+       @echo '  swatdir:     $(swatdir)'
        @echo '  mandir:      $(mandir)'
-       @echo '  torturedir:  $(TORTUREDIR)'
+       @echo '  torturedir:  $(torturedir)'
        @echo '  datadir:     $(datadir)'
        @echo '  winbindd_socket_dir:  $(winbindd_socket_dir)'
        @echo '  ntp_signd_socket_dir:  $(ntp_signd_socket_dir)'
@@ -178,7 +190,7 @@ showflags::
 # The permissions to give the executables
 INSTALLPERMS = 0755
 
-install:: showlayout everything installbin installsbin installdat installswat installmisc \
+install:: showlayout everything installbin installsbin installdat installmisc \
              installlib installheader installpc installplugins
 
 # DESTDIR is used here to prevent packagers wasting their time
@@ -191,10 +203,10 @@ install:: showlayout everything installbin installsbin installdat installswat in
 
 installdirs::
        @$(SHELL) $(srcdir)/script/installdirs.sh \
-               $(DESTDIR)$(BASEDIR) \
+               $(DESTDIR)$(basedir) \
                $(DESTDIR)$(bindir) \
                $(DESTDIR)$(sbindir) \
-               $(DESTDIR)$(TORTUREDIR) \
+               $(DESTDIR)$(torturedir) \
                $(DESTDIR)$(libdir) \
                $(DESTDIR)$(modulesdir) \
                $(DESTDIR)$(mandir) \
@@ -208,7 +220,7 @@ installdirs::
                $(DESTDIR)$(logfilebase) \
                $(DESTDIR)$(privatedir)/tls \
                $(DESTDIR)$(includedir) \
-               $(DESTDIR)$(PKGCONFIGDIR) \
+               $(DESTDIR)$(pkgconfigdir) \
                $(DESTDIR)$(sysconfdir)
 
 installbin:: installdirs
@@ -225,24 +237,21 @@ installheader:: headers installdirs
 installdat:: installdirs
        @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(datadir) $(srcdir)
 
-installswat:: installdirs
-#SWAT has been disabled until further notice
-#      @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir)
-
 installman:: manpages installdirs
        @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
 
 installmisc:: installdirs
-       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(SETUPDIR) $(DESTDIR)$(bindir)
+       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir)
 
 installpc:: installdirs
-       @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(PKGCONFIGDIR) $(PC_FILES)
+       @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)
 
-uninstall:: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader \
-       uninstallplugins
+uninstall:: uninstallbin uninstallsbin uninstalldat uninstallmisc uninstalllib uninstallheader \
+                       uninstallman uninstallpc uninstallplugins
 
 uninstallmisc::
-       #FIXME
+       @echo "Removing MISC files"
+       @rm -rf $(DESTDIR)$(setupdir)/*
 
 $(DESTDIR)$(bindir)/%: bin/% installdirs
        @mkdir -p $(@D)
@@ -258,20 +267,30 @@ $(DESTDIR)$(sbindir)/%: bin/% installdirs
        @cp $< $@
        @chmod $(INSTALLPERMS) $@
 
+uninstalldat::
+       @echo "Removing DAT files"
+       @rm -fr $(DESTDIR)$(datadir)/*
+
 uninstallbin::
 
 uninstalllib::
+       @echo "Removing libraries"
        @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(libdir) $(SHARED_LIBS)
-       #@$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(libdir) $(STATIC_LIBS) 
 
 uninstallheader::
-       @$(SHELL) $(srcdir)/script/uninstallheader.sh $(DESTDIR)$(includedir) $(PUBLIC_HEADERS)
+       @echo "Removing headers"
+       @rm -fr $(DESTDIR)$(includedir)/*
 
 uninstallman::
+       @echo "Removing manpages"
        @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(mandir) $(MANPAGES)
 
 uninstallplugins::
 
+uninstallpc::
+       @echo "Removing package configurations"
+       @cd $(DESTDIR)$(pkgconfigdir); rm -f $(notdir $(PC_FILES))
+
 config.status:
        @echo "config.status does not exist. Please run ./configure."
        @/bin/false
@@ -282,8 +301,8 @@ data.mk: config.status $(MK_FILES)
 testcov-html:: 
 
 include $(pidldir)/config.mk
-selftestdir := $(srcdir)/selftest
-include $(selftestdir)/config.mk
+selftestdir := $(srcdir)/../selftest
+include $(srcdir)/selftest/config.mk
 
 showflags::
        @echo '  pwd        = '`/bin/pwd`