r9459: Move pidl up one level (to prevent too much nesting)

(This used to be commit e48202275e60c18e464457d200daeb953386e221)

41 files changed, 9 insertions, 9 deletions

diff --git a/source4/main.mk b/source4/main.mk
index 47046825c1b..005106cc6a1 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -127,21 +127,21 @@ etags:
 ctags:
 	ctags `find $(srcdir) -name "*.[ch]"`
 
-idl_full: build/pidl/Parse/Pidl/IDL.pm
+idl_full: pidl/Parse/Pidl/IDL.pm
 	@CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh FULL @PIDL_ARGS@
 
-idl: build/pidl/Parse/Pidl/IDL.pm
+idl: pidl/Parse/Pidl/IDL.pm
 	@CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh PARTIAL @PIDL_ARGS@
 
-build/pidl/Parse/Pidl/IDL.pm: build/pidl/idl.yp
-	-yapp -s -m 'Parse::Pidl::IDL' -o build/pidl/Parse/Pidl/IDL.pm build/pidl/idl.yp 
+pidl/Parse/Pidl/IDL.pm: pidl/idl.yp
+	-yapp -s -m 'Parse::Pidl::IDL' -o pidl/Parse/Pidl/IDL.pm pidl/idl.yp 
 
-smb_interfaces: build/pidl/smb_interfaces.pm
-	$(PERL) -Ibuild/pidl script/build_smb_interfaces.pl \
+smb_interfaces: pidl/smb_interfaces.pm
+	$(PERL) -Ipidl script/build_smb_interfaces.pl \
 		include/smb_interfaces.h
 
-build/pidl/smb_interfaces.pm: build/pidl/smb_interfaces.yp
-	-yapp -s -m 'smb_interfaces' -o build/pidl/smb_interfaces.pm build/pidl/smb_interfaces.yp 
+pidl/smb_interfaces.pm: pidl/smb_interfaces.yp
+	-yapp -s -m 'smb_interfaces' -o pidl/smb_interfaces.pm pidl/smb_interfaces.yp 
 
 include/config.h:
 	@echo "include/config.h not present"
diff --git a/source4/build/pidl/Makefile.PL b/source4/pidl/Makefile.PL
index ae862bfdb59..ae862bfdb59 100755
--- a/source4/build/pidl/Makefile.PL
+++ b/source4/pidl/Makefile.PL
diff --git a/source4/build/pidl/Parse/Pidl.pm b/source4/pidl/Parse/Pidl.pm
index 465f3409ad1..465f3409ad1 100644
--- a/source4/build/pidl/Parse/Pidl.pm
+++ b/source4/pidl/Parse/Pidl.pm
diff --git a/source4/build/pidl/Parse/Pidl/Compat.pm b/source4/pidl/Parse/Pidl/Compat.pm
index 39cb67fd717..39cb67fd717 100644
--- a/source4/build/pidl/Parse/Pidl/Compat.pm
+++ b/source4/pidl/Parse/Pidl/Compat.pm
diff --git a/source4/build/pidl/Parse/Pidl/Dump.pm b/source4/pidl/Parse/Pidl/Dump.pm
index bca599262aa..bca599262aa 100644
--- a/source4/build/pidl/Parse/Pidl/Dump.pm
+++ b/source4/pidl/Parse/Pidl/Dump.pm
diff --git a/source4/build/pidl/Parse/Pidl/Ethereal/Conformance.pm b/source4/pidl/Parse/Pidl/Ethereal/Conformance.pm
index 45654fe6aad..45654fe6aad 100644
--- a/source4/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
+++ b/source4/pidl/Parse/Pidl/Ethereal/Conformance.pm
diff --git a/source4/build/pidl/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/Parse/Pidl/Ethereal/NDR.pm
index 73dd34096e2..73dd34096e2 100644
--- a/source4/build/pidl/Parse/Pidl/Ethereal/NDR.pm
+++ b/source4/pidl/Parse/Pidl/Ethereal/NDR.pm
diff --git a/source4/build/pidl/Parse/Pidl/IDL.pm b/source4/pidl/Parse/Pidl/IDL.pm
index 7f7e5bcdcad..7f7e5bcdcad 100644
--- a/source4/build/pidl/Parse/Pidl/IDL.pm
+++ b/source4/pidl/Parse/Pidl/IDL.pm
diff --git a/source4/build/pidl/Parse/Pidl/NDR.pm b/source4/pidl/Parse/Pidl/NDR.pm
index e00a0c98281..e00a0c98281 100644
--- a/source4/build/pidl/Parse/Pidl/NDR.pm
+++ b/source4/pidl/Parse/Pidl/NDR.pm
diff --git a/source4/build/pidl/Parse/Pidl/ODL.pm b/source4/pidl/Parse/Pidl/ODL.pm
index 03d66bfc45d..03d66bfc45d 100644
--- a/source4/build/pidl/Parse/Pidl/ODL.pm
+++ b/source4/pidl/Parse/Pidl/ODL.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/COM/Header.pm b/source4/pidl/Parse/Pidl/Samba/COM/Header.pm
index 7b6c4db212b..7b6c4db212b 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/COM/Header.pm
+++ b/source4/pidl/Parse/Pidl/Samba/COM/Header.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm b/source4/pidl/Parse/Pidl/Samba/COM/Proxy.pm
index c94ef59ae9d..c94ef59ae9d 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm
+++ b/source4/pidl/Parse/Pidl/Samba/COM/Proxy.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/COM/Stub.pm b/source4/pidl/Parse/Pidl/Samba/COM/Stub.pm
index 785c34fc770..785c34fc770 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/COM/Stub.pm
+++ b/source4/pidl/Parse/Pidl/Samba/COM/Stub.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/EJS.pm b/source4/pidl/Parse/Pidl/Samba/EJS.pm
index 743139c8cd3..743139c8cd3 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/EJS.pm
+++ b/source4/pidl/Parse/Pidl/Samba/EJS.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/EJSHeader.pm b/source4/pidl/Parse/Pidl/Samba/EJSHeader.pm
index 81c75705dec..81c75705dec 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/EJSHeader.pm
+++ b/source4/pidl/Parse/Pidl/Samba/EJSHeader.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/Header.pm b/source4/pidl/Parse/Pidl/Samba/Header.pm
index d88b37e229c..d88b37e229c 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/Header.pm
+++ b/source4/pidl/Parse/Pidl/Samba/Header.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/NDR/Client.pm b/source4/pidl/Parse/Pidl/Samba/NDR/Client.pm
index 126dbc3ba9c..126dbc3ba9c 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/NDR/Client.pm
+++ b/source4/pidl/Parse/Pidl/Samba/NDR/Client.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm b/source4/pidl/Parse/Pidl/Samba/NDR/Header.pm
index 9aa0ed8daf7..9aa0ed8daf7 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm
+++ b/source4/pidl/Parse/Pidl/Samba/NDR/Header.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm b/source4/pidl/Parse/Pidl/Samba/NDR/Parser.pm
index ef22ff97886..ef22ff97886 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
+++ b/source4/pidl/Parse/Pidl/Samba/NDR/Parser.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/NDR/Server.pm b/source4/pidl/Parse/Pidl/Samba/NDR/Server.pm
index a8c159572bc..a8c159572bc 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/NDR/Server.pm
+++ b/source4/pidl/Parse/Pidl/Samba/NDR/Server.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/SWIG.pm b/source4/pidl/Parse/Pidl/Samba/SWIG.pm
index 409095804f6..409095804f6 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/SWIG.pm
+++ b/source4/pidl/Parse/Pidl/Samba/SWIG.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/TDR.pm b/source4/pidl/Parse/Pidl/Samba/TDR.pm
index b9bfd83e417..b9bfd83e417 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/TDR.pm
+++ b/source4/pidl/Parse/Pidl/Samba/TDR.pm
diff --git a/source4/build/pidl/Parse/Pidl/Samba/Template.pm b/source4/pidl/Parse/Pidl/Samba/Template.pm
index eb71b6d7076..eb71b6d7076 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/Template.pm
+++ b/source4/pidl/Parse/Pidl/Samba/Template.pm
diff --git a/source4/build/pidl/Parse/Pidl/Test.pm b/source4/pidl/Parse/Pidl/Test.pm
index 34ea80c95cd..34ea80c95cd 100644
--- a/source4/build/pidl/Parse/Pidl/Test.pm
+++ b/source4/pidl/Parse/Pidl/Test.pm
diff --git a/source4/build/pidl/Parse/Pidl/Typelist.pm b/source4/pidl/Parse/Pidl/Typelist.pm
index 10a4baf7e7a..10a4baf7e7a 100644
--- a/source4/build/pidl/Parse/Pidl/Typelist.pm
+++ b/source4/pidl/Parse/Pidl/Typelist.pm
diff --git a/source4/build/pidl/Parse/Pidl/Util.pm b/source4/pidl/Parse/Pidl/Util.pm
index 8854be9d745..8854be9d745 100644
--- a/source4/build/pidl/Parse/Pidl/Util.pm
+++ b/source4/pidl/Parse/Pidl/Util.pm
diff --git a/source4/build/pidl/README b/source4/pidl/README
index e6768b69407..e6768b69407 100644
--- a/source4/build/pidl/README
+++ b/source4/pidl/README
diff --git a/source4/build/pidl/TODO b/source4/pidl/TODO
index f341dba846a..f341dba846a 100644
--- a/source4/build/pidl/TODO
+++ b/source4/pidl/TODO
diff --git a/source4/build/pidl/idl.yp b/source4/pidl/idl.yp
index d5838d0c437..d5838d0c437 100644
--- a/source4/build/pidl/idl.yp
+++ b/source4/pidl/idl.yp
diff --git a/source4/build/pidl/pidl b/source4/pidl/pidl
index ead70b1fad5..ead70b1fad5 100755
--- a/source4/build/pidl/pidl
+++ b/source4/pidl/pidl
diff --git a/source4/build/pidl/pidl.1.xml b/source4/pidl/pidl.1.xml
index cf7f560f0db..cf7f560f0db 100644
--- a/source4/build/pidl/pidl.1.xml
+++ b/source4/pidl/pidl.1.xml
diff --git a/source4/build/pidl/ref_notes.txt b/source4/pidl/ref_notes.txt
index 00f44fddb77..00f44fddb77 100644
--- a/source4/build/pidl/ref_notes.txt
+++ b/source4/pidl/ref_notes.txt
diff --git a/source4/build/pidl/smb_interfaces.pm b/source4/pidl/smb_interfaces.pm
index c9cc4495b1c..c9cc4495b1c 100644
--- a/source4/build/pidl/smb_interfaces.pm
+++ b/source4/pidl/smb_interfaces.pm
diff --git a/source4/build/pidl/smb_interfaces.yp b/source4/pidl/smb_interfaces.yp
index f8c34eacdcb..f8c34eacdcb 100644
--- a/source4/build/pidl/smb_interfaces.yp
+++ b/source4/pidl/smb_interfaces.yp
diff --git a/source4/build/pidl/tests/ndr_align.pl b/source4/pidl/tests/ndr_align.pl
index da994224eb9..da994224eb9 100755
--- a/source4/build/pidl/tests/ndr_align.pl
+++ b/source4/pidl/tests/ndr_align.pl
diff --git a/source4/build/pidl/tests/ndr_alloc.pl b/source4/pidl/tests/ndr_alloc.pl
index 4f6eddbfb90..4f6eddbfb90 100755
--- a/source4/build/pidl/tests/ndr_alloc.pl
+++ b/source4/pidl/tests/ndr_alloc.pl
diff --git a/source4/build/pidl/tests/ndr_array.pl b/source4/pidl/tests/ndr_array.pl
index d486308339d..d486308339d 100755
--- a/source4/build/pidl/tests/ndr_array.pl
+++ b/source4/pidl/tests/ndr_array.pl
diff --git a/source4/build/pidl/tests/ndr_refptr.pl b/source4/pidl/tests/ndr_refptr.pl
index 8344661ad3d..8344661ad3d 100755
--- a/source4/build/pidl/tests/ndr_refptr.pl
+++ b/source4/pidl/tests/ndr_refptr.pl
diff --git a/source4/build/pidl/tests/ndr_simple.pl b/source4/pidl/tests/ndr_simple.pl
index 7d48c9f4d71..7d48c9f4d71 100755
--- a/source4/build/pidl/tests/ndr_simple.pl
+++ b/source4/pidl/tests/ndr_simple.pl
diff --git a/source4/build/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl
index ad8db912d74..ad8db912d74 100755
--- a/source4/build/pidl/tests/ndr_string.pl
+++ b/source4/pidl/tests/ndr_string.pl
diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh
index 2f899aef458..13d1178c4ad 100755
--- a/source4/script/build_idl.sh
+++ b/source4/script/build_idl.sh
@@ -6,7 +6,7 @@ PIDL_EXTRA_ARGS="$*"
 
 [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
 
-PIDL="$PERL -Ibuild/pidl ./build/pidl/pidl --outputdir librpc/gen_ndr --parse --ndr-header --header --ndr-parser --server --client --dcom-proxy --com-header --swig --odl --ejs $PIDL_EXTRA_ARGS"
+PIDL="$PERL -Ipidl ./pidl/pidl --outputdir librpc/gen_ndr --parse --ndr-header --header --ndr-parser --server --client --dcom-proxy --com-header --swig --odl --ejs $PIDL_EXTRA_ARGS"
 
 if [ x$FULLBUILD = xFULL ]; then
       echo Rebuilding all idl files in librpc/idl