Fix SharesContainer.__len__.

[samba.git] / source4 / Makefile

diff --git a/source4/Makefile b/source4/Makefile
index 26cab668c80135cc555a8a4bb50aa951b513a6aa..0da1ee2626b32b05ec9ac1b2beaec2da4dcfe19b 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -11,10 +11,10 @@ include mkconfig.mk
 pidldir := $(srcdir)/../pidl
 
 basedir = $(prefix)
-torturedir = $(libdir)/torture
 swatdir = $(datadir)/swat
 setupdir = $(datadir)/setup
 ncalrpcdir = $(localstatedir)/ncalrpc
+shliboutputdir = $(builddir)/bin/shared
 
 BNLD = $(LD)
 BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
@@ -46,6 +46,8 @@ ALL_PREDEP = basics
 .NOTPARALLEL:
 endif
 
+base_srcdirs = $(srcdir) ../librpc/ ../lib/ ../libcli ../libgpo ../nsswitch ../libds
+
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
 zlibsrcdir := ../lib/zlib
@@ -56,10 +58,11 @@ smbdsrcdir := smbd
 clustersrcdir := cluster
 libnetsrcdir := libnet
 authsrcdir := auth
-nsswitchsrcdir := nsswitch
+nsswitchsrcdir := ../nsswitch
+libwbclientsrcdir := ../nsswitch/libwbclient
 libsrcdir := lib
 libsocketsrcdir := lib/socket
-libcharsetsrcdir := lib/charset
+libcharsetsrcdir := ../lib/util/charset
 ldb_sambasrcdir := lib/ldb-samba
 tdbsrcdir := ../lib/tdb
 ldbsrcdir := lib/ldb
@@ -67,18 +70,19 @@ libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
 smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
+libteventsrcdir := ../lib/tevent
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
 poptsrcdir := ../lib/popt
 socketwrappersrcdir := ../lib/socket_wrapper
 nsswrappersrcdir := ../lib/nss_wrapper
+uidwrappersrcdir := ../lib/uid_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := ../lib/util
-libtdrsrcdir := lib/tdr
-libdbwrapsrcdir := lib/dbwrap
+libtdrsrcdir := ../lib/tdr
 libcryptosrcdir := ../lib/crypto
-libtorturesrcdir := lib/torture
+libtorturesrcdir := ../lib/torture
 smb_serversrcdir := smb_server
 libcompressionsrcdir := ../lib/compression
 libgencachesrcdir := lib
@@ -97,6 +101,7 @@ ntvfssrcdir := ntvfs
 ntptrsrcdir := ntptr
 librpcsrcdir := librpc
 libclisrcdir := libcli
+libclicommonsrcdir := ../libcli
 libclinbtsrcdir := ../libcli/nbt
 pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
@@ -104,11 +109,10 @@ ntp_signdsrcdir := ntp_signd
 wmisrcdir := lib/wmi
 tallocsrcdir := ../lib/talloc
 comsrcdir := $(srcdir)/lib/com
+libgpodir := libgpo
 
 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 $@
@@ -142,19 +146,18 @@ include $(srcdir)/static_deps.mk
 endif
 
 clean::
-       @find ../lib ../libcli -name '*.o' -o -name '*.ho' | xargs rm -f
+       @find $(base_srcdirs) -name '*.o' -o -name '*.ho' | xargs rm -f
 
-DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
-                 $(srcdir)/version.h
+PUBLIC_HEADERS += ./version.h
 
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)
-headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
+headers:: $(PUBLIC_HEADERS)
 manpages:: $(MANPAGES)
 all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
 
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir):$$$(LIB_PATH_VAR)
 
 # 'make testsuite' creates all binaries which are
 # needed by samba3's 'make test' and the build-farm
@@ -178,7 +181,6 @@ showlayout::
        @echo '  setupdir:    $(setupdir)'
        @echo '  swatdir:     $(swatdir)'
        @echo '  mandir:      $(mandir)'
-       @echo '  torturedir:  $(torturedir)'
        @echo '  datadir:     $(datadir)'
        @echo '  winbindd_socket_dir:  $(winbindd_socket_dir)'
        @echo '  ntp_signd_socket_dir:  $(ntp_signd_socket_dir)'
@@ -206,9 +208,9 @@ installdirs::
                $(DESTDIR)$(basedir) \
                $(DESTDIR)$(bindir) \
                $(DESTDIR)$(sbindir) \
-               $(DESTDIR)$(torturedir) \
                $(DESTDIR)$(libdir) \
                $(DESTDIR)$(modulesdir) \
+               $(DESTDIR)$(modulesdir)/ldb \
                $(DESTDIR)$(mandir) \
                $(DESTDIR)$(localstatedir) \
                $(DESTDIR)$(localstatedir)/lib \
@@ -232,7 +234,7 @@ installlib:: $(SHARED_LIBS) $(STATIC_LIBS) installdirs
        #@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(STLIBEXT)" $(STATIC_LIBS)
 
 installheader:: headers installdirs
-       @srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
+       @srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS)
 
 installdat:: installdirs
        @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(datadir) $(srcdir)
@@ -241,7 +243,7 @@ installman:: manpages installdirs
        @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
 
 installmisc:: installdirs
-       @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir)
+       @$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON)
 
 installpc:: installdirs
        @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)