diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-25 16:37:02 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-26 11:57:08 -0600 |
| commit | 251a4e07803d0fa95b1324d60133475ef8c41e79 (patch) | |
| tree | 8ccf2a83617b582f467952589748bc714fed48ef | |
| parent | 7ff974a226b3dda63a91ef0702b12406e130f809 (diff) | |
| download | samba-251a4e07803d0fa95b1324d60133475ef8c41e79.tar.gz samba-251a4e07803d0fa95b1324d60133475ef8c41e79.tar.bz2 samba-251a4e07803d0fa95b1324d60133475ef8c41e79.zip | |
r26600: Provide dir variable with current basedir in Makefile.
(This used to be commit b06d3e1a52d6b71a1e3e7a9e0ecf69f3b899ae18)
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 1 | ||||
| -rw-r--r-- | source4/lib/policy/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 14 | ||||
| -rw-r--r-- | source4/scripting/python/config.mk | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 7ad6600a8c..61e436942d 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -215,6 +215,7 @@ sub run_config_mk($$$$) # corresponding input files. The curlies are so you can match the # BEGIN/END pairs in a text editor. $makefile .= "# BEGIN{ $parsing_file\n"; + $makefile .= "dir = $basedir\n"; foreach (@lines) { $linenum++; diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk index f404d58377..da9c8daba4 100644 --- a/source4/lib/policy/config.mk +++ b/source4/lib/policy/config.mk @@ -3,9 +3,9 @@ CFLAGS = -Iheimdal/lib/roken OBJ_FILES = lex.o parse_adm.o PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET -lib/policy/lex.l: lib/policy/parse_adm.h +$(dir)/lex.l: $(dir)/parse_adm.h -lib/policy/parse_adm.h: lib/policy/parse_adm.c +$(dir)/parse_adm.h: $(dir)/parse_adm.c [BINARY::dumpadm] OBJ_FILES = dumpadm.o diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index f1f50479cb..71c973f68d 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -3,16 +3,16 @@ PUBLIC_DEPENDENCIES = TDR OBJ_FILES = tdr_regf.o # Special support for external builddirs -lib/registry/regf.c: lib/registry/tdr_regf.c -$(srcdir)/lib/registry/regf.c: lib/registry/tdr_regf.c -lib/registry/tdr_regf.h: lib/registry/tdr_regf.c -lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl +$(dir)/regf.c: $(dir)/tdr_regf.c +$(srcdir)/$(dir)/regf.c: $(dir)/tdr_regf.c +$(dir)/tdr_regf.h: $(dir)/tdr_regf.c +$(dir)/tdr_regf.c: $(srcdir)/$(dir)/regf.idl @CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \ - --header --outputdir=lib/registry \ - --tdr-parser -- $(srcdir)/lib/registry/regf.idl + --header --outputdir=$(dir) \ + --tdr-parser -- $(srcdir)/$(dir)/regf.idl clean:: - @-rm -f lib/registry/regf.h lib/registry/tdr_regf* + @-rm -f $(dir)/regf.h $(dir)/tdr_regf* ################################################ # Start SUBSYSTEM registry diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index 4a531f5062..ecf8f9a102 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -33,7 +33,7 @@ pythonmods: $(PYTHON_DSOS) PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py pydoctor:: pythonmods - LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES)) + LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package $(dir)/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES)) clean:: @echo "Removing python modules" |