Remove convert_string_talloc_descriptor, add iconv_talloc().

[abartlet/samba.git/.git] / source3 / samba4.mk

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 15774d9a9422133f0c80a2a12e2edb7e003133cd..c3b6af10e42e0444d64585ddb2da9a62819b31a1 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -11,7 +11,7 @@ samba4srcdir = $(srcdir)/../source4
 
 # Flags used for the samba 4 files
 # $(srcdir)/include is required for config.h
-SAMBA4_CFLAGS = -I$(samba4srcdir) -I$(samba4srcdir)/include \
+SAMBA4_CFLAGS = -I.. -I$(samba4srcdir) -I$(samba4srcdir)/include \
                 -I$(samba4srcdir)/../lib/replace -I$(samba4srcdir)/lib \
                 -I$(heimdalsrcdir)/lib/hcrypto -I$(tallocdir) \
                 -I$(srcdir)/include -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H
@@ -73,7 +73,7 @@ authsrcdir := $(samba4srcdir)/auth
 nsswitchsrcdir := $(samba4srcdir)/nsswitch
 libsrcdir := $(samba4srcdir)/lib
 libsocketsrcdir := $(samba4srcdir)/lib/socket
-libcharsetsrcdir := $(samba4srcdir)/lib/charset
+libcharsetsrcdir := $(samba4srcdir)/../lib/util/charset
 ldb_sambasrcdir := $(samba4srcdir)/lib/ldb-samba
 libtlssrcdir := $(samba4srcdir)/lib/tls
 libregistrysrcdir := $(samba4srcdir)/lib/registry
@@ -118,20 +118,21 @@ tallocsrcdir := $(samba4srcdir)/../lib/talloc
 comsrcdir := $(samba4srcdir)/lib/com
 override ASN1C = bin/asn1_compile4
 override ET_COMPILER = bin/compile_et4
+include $(samba4srcdir)/build/make/python.mk
 include samba4-data.mk
 include $(samba4srcdir)/static_deps.mk
-include $(samba4srcdir)/build/make/python.mk
 
 INSTALLPERMS = 0755
+$(foreach SCRIPT,$(wildcard scripting/bin/*),$(eval $(call binary_install_template,$(SCRIPT))))
 
-$(DESTDIR)$(bindir)/%: bin/%4 installdirs
+$(DESTDIR)$(bindir)/%4: bin/%4 installdirs
        @mkdir -p $(@D)
        @echo Installing $(@F) as $@
        @if test -f $@; then rm -f $@.old; mv $@ $@.old; fi
        @cp $< $@
        @chmod $(INSTALLPERMS) $@
 
-$(DESTDIR)$(sbindir)/%: bin/%4 installdirs
+$(DESTDIR)$(sbindir)/%4: bin/%4 installdirs
        @mkdir -p $(@D)
        @echo Installing $(@F) as $@
        @if test -f $@; then rm -f $@.old; mv $@ $@.old; fi
@@ -158,14 +159,8 @@ clean::
 proto:: $(PROTO_HEADERS)
 modules:: $(PLUGINS)
 
-all:: basics bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
-torture:: basics bin/smbtorture4
-everything:: basics $(patsubst %,%4,$(BINARIES))
-
-
-etags::
-       etags --append=yes `find $(samba4srcdir) -name "*.[ch]"`
-
-ctags::
-       ctags --append=yes `find $(samba4srcdir) -name "*.[ch]"`
+pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
 
+all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
+torture:: bin/smbtorture4
+everything:: $(patsubst %,%4,$(BINARIES))