r26602: Revert my previous commit as it only works with GNU make.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 25 Dec 2007 23:34:07 +0000 (17:34 -0600)
committerStefan Metzmacher <metze@samba.org>
Wed, 26 Dec 2007 17:57:09 +0000 (11:57 -0600)
(This used to be commit ecd2d96c3173e4d2f77a1ca50f26a16ac7a313b1)

source4/build/smb_build/config_mk.pm
source4/lib/policy/config.mk
source4/lib/registry/config.mk
source4/scripting/python/config.mk

index 61e436942d5e468fc061dabf63b2d038f38b2b2f..7ad6600a8c4510053d215830dc49734c462612ed 100644 (file)
@@ -215,7 +215,6 @@ 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++;
index da9c8daba46c5bc032adeabdc769f2328486ea76..f404d58377394124fa23e01b7218c8caa242a58d 100644 (file)
@@ -3,9 +3,9 @@ CFLAGS = -Iheimdal/lib/roken
 OBJ_FILES = lex.o parse_adm.o 
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET 
 
-$(dir)/lex.l: $(dir)/parse_adm.h
+lib/policy/lex.l: lib/policy/parse_adm.h
 
-$(dir)/parse_adm.h: $(dir)/parse_adm.c
+lib/policy/parse_adm.h: lib/policy/parse_adm.c
 
 [BINARY::dumpadm]
 OBJ_FILES = dumpadm.o
index 71c973f68d449637714f35478283e9d966e61e29..f1f50479cbce66e5070bb5adaf55e6e876ba234a 100644 (file)
@@ -3,16 +3,16 @@ PUBLIC_DEPENDENCIES = TDR
 OBJ_FILES = tdr_regf.o
 
 # Special support for external builddirs
-$(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
+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
        @CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
-               --header --outputdir=$(dir) \
-               --tdr-parser -- $(srcdir)/$(dir)/regf.idl
+               --header --outputdir=lib/registry \
+               --tdr-parser -- $(srcdir)/lib/registry/regf.idl
 
 clean::
-       @-rm -f $(dir)/regf.h $(dir)/tdr_regf*
+       @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
 
 ################################################
 # Start SUBSYSTEM registry
index ecf8f9a102017537fccf9da193e6efb50006e3fa..4a531f5062d9e4f18ab23e1666f7c3899304584c 100644 (file)
@@ -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 $(dir)/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+       LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
 
 clean::
        @echo "Removing python modules"