Author: jelmer Date: 2007-12-25 16:37:02 +0000 (Tue, 25 Dec 2007) New Revision: 26600
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26600 Log: Provide dir variable with current basedir in Makefile. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm branches/SAMBA_4_0/source/lib/policy/config.mk branches/SAMBA_4_0/source/lib/registry/config.mk branches/SAMBA_4_0/source/scripting/python/config.mk Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2007-12-25 16:36:58 UTC (rev 26599) +++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2007-12-25 16:37:02 UTC (rev 26600) @@ -215,6 +215,7 @@ # 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++; Modified: branches/SAMBA_4_0/source/lib/policy/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/policy/config.mk 2007-12-25 16:36:58 UTC (rev 26599) +++ branches/SAMBA_4_0/source/lib/policy/config.mk 2007-12-25 16:37:02 UTC (rev 26600) @@ -3,9 +3,9 @@ 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 Modified: branches/SAMBA_4_0/source/lib/registry/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/registry/config.mk 2007-12-25 16:36:58 UTC (rev 26599) +++ branches/SAMBA_4_0/source/lib/registry/config.mk 2007-12-25 16:37:02 UTC (rev 26600) @@ -3,16 +3,16 @@ 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 Modified: branches/SAMBA_4_0/source/scripting/python/config.mk =================================================================== --- branches/SAMBA_4_0/source/scripting/python/config.mk 2007-12-25 16:36:58 UTC (rev 26599) +++ branches/SAMBA_4_0/source/scripting/python/config.mk 2007-12-25 16:37:02 UTC (rev 26600) @@ -33,7 +33,7 @@ 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"
