diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-25 10:04:20 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-25 10:04:20 +0100 |
| commit | cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31 (patch) | |
| tree | d0b116699dee35372ed335834989e1c885e8f94a /source4/build/make | |
| parent | d1432d617e6ed04c33ca214d7f3b0099bdf53065 (diff) | |
| parent | 240d959005f5fd80a38b3734b39dd5d6e425a566 (diff) | |
| download | samba-cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31.tar.gz samba-cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31.tar.bz2 samba-cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/Makefile
source/auth/config.mk
source/auth/gensec/config.mk
source/build/m4/public.m4
source/build/make/python.mk
source/build/make/rules.mk
source/build/smb_build/header.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/dsdb/samdb/ldb_modules/config.mk
source/kdc/config.mk
source/lib/events/config.mk
source/lib/events/events.c
source/lib/ldb/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/util/config.mk
source/libcli/smb2/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/nbt_server/config.mk
source/ntptr/ntptr_base.c
source/ntvfs/posix/config.mk
source/ntvfs/sysdep/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/rpc_server/service_rpc.c
source/scripting/ejs/config.mk
source/scripting/python/config.mk
source/smb_server/config.mk
source/smbd/server.c
source/torture/config.mk
source/torture/smb2/config.mk
source/wrepl_server/config.mk
(This used to be commit 13bbd420681519894a4036729c43273912c9b402)
Diffstat (limited to 'source4/build/make')
| -rw-r--r-- | source4/build/make/python.mk | 4 | ||||
| -rw-r--r-- | source4/build/make/rules.mk | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source4/build/make/python.mk b/source4/build/make/python.mk index 57bf0169fe..6c1798212e 100644 --- a/source4/build/make/python.mk +++ b/source4/build/make/python.mk @@ -56,3 +56,7 @@ clean:: pydoctor:: pythonmods LD_LIBRARY_PATH=bin/shared PYTHONPATH=$(pythonbuilddir) pydoctor --project-name=Samba --project-url=http://www.samba.org --make-html --docformat=restructuredtext --add-package $(pythonbuilddir)/samba + +bin/python/%.py: + mkdir -p $(@D) + cp $< $@ diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk index faefb4e323..078f5d9295 100644 --- a/source4/build/make/rules.mk +++ b/source4/build/make/rules.mk @@ -211,8 +211,9 @@ include/includes.d: include/includes.h @echo "Compiling $<" @-mkdir -p `dirname $@` @$(COMPILE) && exit 0 ; \ - $(COMPILE) - + echo "The following command failed:" 1>&2;\ + echo "$(COMPILE)" 1>&2;\ + $(COMPILE) >/dev/null 2>&1 .c.ho: |