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

(This used to be commit e48202275e60c18e464457d200daeb953386e221)

diff --git a/source4/main.mk b/source4/main.mk
index 47046825c1bc0f3f33a7abfa6a2ec9c972c970b4..005106cc6a17f180d68c92573368dca25b67de5f 100644 (file)
--- 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
similarity index 100%
rename from source4/build/pidl/Makefile.PL
rename to source4/pidl/Makefile.PL

diff --git a/source4/build/pidl/Parse/Pidl.pm b/source4/pidl/Parse/Pidl.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl.pm
rename to source4/pidl/Parse/Pidl.pm

diff --git a/source4/build/pidl/Parse/Pidl/Compat.pm b/source4/pidl/Parse/Pidl/Compat.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Compat.pm
rename to source4/pidl/Parse/Pidl/Compat.pm

diff --git a/source4/build/pidl/Parse/Pidl/Dump.pm b/source4/pidl/Parse/Pidl/Dump.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Dump.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Ethereal/Conformance.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Ethereal/NDR.pm
rename to source4/pidl/Parse/Pidl/Ethereal/NDR.pm

diff --git a/source4/build/pidl/Parse/Pidl/IDL.pm b/source4/pidl/Parse/Pidl/IDL.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/IDL.pm
rename to source4/pidl/Parse/Pidl/IDL.pm

diff --git a/source4/build/pidl/Parse/Pidl/NDR.pm b/source4/pidl/Parse/Pidl/NDR.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/NDR.pm
rename to source4/pidl/Parse/Pidl/NDR.pm

diff --git a/source4/build/pidl/Parse/Pidl/ODL.pm b/source4/pidl/Parse/Pidl/ODL.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/ODL.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/COM/Header.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/COM/Stub.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/EJS.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/EJSHeader.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/Header.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/NDR/Client.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/NDR/Server.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/SWIG.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/TDR.pm
rename to 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
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Samba/Template.pm
rename to source4/pidl/Parse/Pidl/Samba/Template.pm

diff --git a/source4/build/pidl/Parse/Pidl/Test.pm b/source4/pidl/Parse/Pidl/Test.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Test.pm
rename to source4/pidl/Parse/Pidl/Test.pm

diff --git a/source4/build/pidl/Parse/Pidl/Typelist.pm b/source4/pidl/Parse/Pidl/Typelist.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Typelist.pm
rename to source4/pidl/Parse/Pidl/Typelist.pm

diff --git a/source4/build/pidl/Parse/Pidl/Util.pm b/source4/pidl/Parse/Pidl/Util.pm
similarity index 100%
rename from source4/build/pidl/Parse/Pidl/Util.pm
rename to source4/pidl/Parse/Pidl/Util.pm

diff --git a/source4/build/pidl/README b/source4/pidl/README
similarity index 100%
rename from source4/build/pidl/README
rename to source4/pidl/README

diff --git a/source4/build/pidl/TODO b/source4/pidl/TODO
similarity index 100%
rename from source4/build/pidl/TODO
rename to source4/pidl/TODO

diff --git a/source4/build/pidl/idl.yp b/source4/pidl/idl.yp
similarity index 100%
rename from source4/build/pidl/idl.yp
rename to source4/pidl/idl.yp

diff --git a/source4/build/pidl/pidl b/source4/pidl/pidl
similarity index 100%
rename from source4/build/pidl/pidl
rename to source4/pidl/pidl

diff --git a/source4/build/pidl/pidl.1.xml b/source4/pidl/pidl.1.xml
similarity index 100%
rename from source4/build/pidl/pidl.1.xml
rename to source4/pidl/pidl.1.xml

diff --git a/source4/build/pidl/ref_notes.txt b/source4/pidl/ref_notes.txt
similarity index 100%
rename from source4/build/pidl/ref_notes.txt
rename to source4/pidl/ref_notes.txt

diff --git a/source4/build/pidl/smb_interfaces.pm b/source4/pidl/smb_interfaces.pm
similarity index 100%
rename from source4/build/pidl/smb_interfaces.pm
rename to source4/pidl/smb_interfaces.pm

diff --git a/source4/build/pidl/smb_interfaces.yp b/source4/pidl/smb_interfaces.yp
similarity index 100%
rename from source4/build/pidl/smb_interfaces.yp
rename to source4/pidl/smb_interfaces.yp

diff --git a/source4/build/pidl/tests/ndr_align.pl b/source4/pidl/tests/ndr_align.pl
similarity index 100%
rename from source4/build/pidl/tests/ndr_align.pl
rename to source4/pidl/tests/ndr_align.pl

diff --git a/source4/build/pidl/tests/ndr_alloc.pl b/source4/pidl/tests/ndr_alloc.pl
similarity index 100%
rename from source4/build/pidl/tests/ndr_alloc.pl
rename to source4/pidl/tests/ndr_alloc.pl

diff --git a/source4/build/pidl/tests/ndr_array.pl b/source4/pidl/tests/ndr_array.pl
similarity index 100%
rename from source4/build/pidl/tests/ndr_array.pl
rename to source4/pidl/tests/ndr_array.pl

diff --git a/source4/build/pidl/tests/ndr_refptr.pl b/source4/pidl/tests/ndr_refptr.pl
similarity index 100%
rename from source4/build/pidl/tests/ndr_refptr.pl
rename to source4/pidl/tests/ndr_refptr.pl

diff --git a/source4/build/pidl/tests/ndr_simple.pl b/source4/pidl/tests/ndr_simple.pl
similarity index 100%
rename from source4/build/pidl/tests/ndr_simple.pl
rename to source4/pidl/tests/ndr_simple.pl

diff --git a/source4/build/pidl/tests/ndr_string.pl b/source4/pidl/tests/ndr_string.pl
similarity index 100%
rename from source4/build/pidl/tests/ndr_string.pl
rename to source4/pidl/tests/ndr_string.pl

diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh
index 2f899aef45868523f9f904c031643597f4feaa82..13d1178c4ad4837ec95cd1a758d0f7b190e98713 100755 (executable)
--- 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