Move pidl to top-level directory.

66 files changed, 3 insertions, 3 deletions

diff --git a/source4/pidl/MANIFEST b/pidl/MANIFEST
index 051c5d2b19f..051c5d2b19f 100644
--- a/source4/pidl/MANIFEST
+++ b/pidl/MANIFEST
diff --git a/source4/pidl/META.yml b/pidl/META.yml
index 4822b50f09e..4822b50f09e 100644
--- a/source4/pidl/META.yml
+++ b/pidl/META.yml
diff --git a/source4/pidl/Makefile.PL b/pidl/Makefile.PL
index 2a405fcc2b1..2a405fcc2b1 100755
--- a/source4/pidl/Makefile.PL
+++ b/pidl/Makefile.PL
diff --git a/source4/pidl/README b/pidl/README
index d6783872824..d6783872824 100644
--- a/source4/pidl/README
+++ b/pidl/README
diff --git a/source4/pidl/TODO b/pidl/TODO
index 8886441a756..8886441a756 100644
--- a/source4/pidl/TODO
+++ b/pidl/TODO
diff --git a/source4/pidl/config.m4 b/pidl/config.m4
index 8b8bc5acf02..8b8bc5acf02 100644
--- a/source4/pidl/config.m4
+++ b/pidl/config.m4
diff --git a/source4/pidl/config.mk b/pidl/config.mk
index 07c8647ecd4..07c8647ecd4 100644
--- a/source4/pidl/config.mk
+++ b/pidl/config.mk
diff --git a/source4/pidl/expr.yp b/pidl/expr.yp
index a8074875ff9..a8074875ff9 100644
--- a/source4/pidl/expr.yp
+++ b/pidl/expr.yp
diff --git a/source4/pidl/idl.yp b/pidl/idl.yp
index d557590494e..d557590494e 100644
--- a/source4/pidl/idl.yp
+++ b/pidl/idl.yp
diff --git a/source4/pidl/lib/Parse/Pidl.pm b/pidl/lib/Parse/Pidl.pm
index c2c9463d03f..c2c9463d03f 100644
--- a/source4/pidl/lib/Parse/Pidl.pm
+++ b/pidl/lib/Parse/Pidl.pm
diff --git a/source4/pidl/lib/Parse/Pidl/CUtil.pm b/pidl/lib/Parse/Pidl/CUtil.pm
index 9deb6ee1779..9deb6ee1779 100644
--- a/source4/pidl/lib/Parse/Pidl/CUtil.pm
+++ b/pidl/lib/Parse/Pidl/CUtil.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Compat.pm b/pidl/lib/Parse/Pidl/Compat.pm
index 75190211441..75190211441 100644
--- a/source4/pidl/lib/Parse/Pidl/Compat.pm
+++ b/pidl/lib/Parse/Pidl/Compat.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Dump.pm b/pidl/lib/Parse/Pidl/Dump.pm
index bf5811c116f..bf5811c116f 100644
--- a/source4/pidl/lib/Parse/Pidl/Dump.pm
+++ b/pidl/lib/Parse/Pidl/Dump.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Expr.pm b/pidl/lib/Parse/Pidl/Expr.pm
index 5524374faed..5524374faed 100644
--- a/source4/pidl/lib/Parse/Pidl/Expr.pm
+++ b/pidl/lib/Parse/Pidl/Expr.pm
diff --git a/source4/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index 06d54fb4b5f..06d54fb4b5f 100644
--- a/source4/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index 9b61a370e21..9b61a370e21 100644
--- a/source4/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
diff --git a/source4/pidl/lib/Parse/Pidl/ODL.pm b/pidl/lib/Parse/Pidl/ODL.pm
index ad8c76f6226..ad8c76f6226 100644
--- a/source4/pidl/lib/Parse/Pidl/ODL.pm
+++ b/pidl/lib/Parse/Pidl/ODL.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index 2a23fad4a70..2a23fad4a70 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index b21d3f4bbc2..b21d3f4bbc2 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/pidl/lib/Parse/Pidl/Samba4.pm
index d42e01cdb04..d42e01cdb04 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4.pm
+++ b/pidl/lib/Parse/Pidl/Samba4.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm b/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm
index 996689b4b62..996689b4b62 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm b/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
index ca9f37a0531..ca9f37a0531 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm b/pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm
index 150acbfde9b..150acbfde9b 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index efb3f2858d6..efb3f2858d6 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/EJS.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 611f0adb92c..611f0adb92c 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Header.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index f8209be654b..f8209be654b 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index fb73075f1ad..fb73075f1ad 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index e30102b4e1f..e30102b4e1f 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 74cec5a8274..74cec5a8274 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/SWIG.pm b/pidl/lib/Parse/Pidl/Samba4/SWIG.pm
index 14424cf2604..14424cf2604 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/SWIG.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/SWIG.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
index 568dff5adf5..568dff5adf5 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/TDR.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Template.pm b/pidl/lib/Parse/Pidl/Samba4/Template.pm
index a35fc7d2eb0..a35fc7d2eb0 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Template.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Template.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index c5c458ac6b9..c5c458ac6b9 100644
--- a/source4/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Util.pm b/pidl/lib/Parse/Pidl/Util.pm
index 006718d139a..006718d139a 100644
--- a/source4/pidl/lib/Parse/Pidl/Util.pm
+++ b/pidl/lib/Parse/Pidl/Util.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm b/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
index 5c37b4a0c4f..5c37b4a0c4f 100644
--- a/source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
diff --git a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 8846b740ab7..8846b740ab7 100644
--- a/source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
diff --git a/source4/pidl/lib/Parse/Yapp/Driver.pm b/pidl/lib/Parse/Yapp/Driver.pm
index d0dcbf54eb2..d0dcbf54eb2 100644
--- a/source4/pidl/lib/Parse/Yapp/Driver.pm
+++ b/pidl/lib/Parse/Yapp/Driver.pm
diff --git a/source4/pidl/pidl b/pidl/pidl
index e58442ba1b6..e58442ba1b6 100755
--- a/source4/pidl/pidl
+++ b/pidl/pidl
diff --git a/source4/pidl/tests/Util.pm b/pidl/tests/Util.pm
index 4ad216a6a10..4ad216a6a10 100644
--- a/source4/pidl/tests/Util.pm
+++ b/pidl/tests/Util.pm
diff --git a/source4/pidl/tests/cutil.pl b/pidl/tests/cutil.pl
index 78c8bce45e1..78c8bce45e1 100755
--- a/source4/pidl/tests/cutil.pl
+++ b/pidl/tests/cutil.pl
diff --git a/source4/pidl/tests/dump.pl b/pidl/tests/dump.pl
index d1a56f09735..d1a56f09735 100755
--- a/source4/pidl/tests/dump.pl
+++ b/pidl/tests/dump.pl
diff --git a/source4/pidl/tests/header.pl b/pidl/tests/header.pl
index db594844446..db594844446 100755
--- a/source4/pidl/tests/header.pl
+++ b/pidl/tests/header.pl
diff --git a/source4/pidl/tests/ndr.pl b/pidl/tests/ndr.pl
index 504b7ec8ded..504b7ec8ded 100755
--- a/source4/pidl/tests/ndr.pl
+++ b/pidl/tests/ndr.pl
diff --git a/source4/pidl/tests/ndr_align.pl b/pidl/tests/ndr_align.pl
index cc089eaa1f7..cc089eaa1f7 100755
--- a/source4/pidl/tests/ndr_align.pl
+++ b/pidl/tests/ndr_align.pl
diff --git a/source4/pidl/tests/ndr_alloc.pl b/pidl/tests/ndr_alloc.pl
index 399fbd21d62..399fbd21d62 100755
--- a/source4/pidl/tests/ndr_alloc.pl
+++ b/pidl/tests/ndr_alloc.pl
diff --git a/source4/pidl/tests/ndr_array.pl b/pidl/tests/ndr_array.pl
index 2a6b5bbd57d..2a6b5bbd57d 100755
--- a/source4/pidl/tests/ndr_array.pl
+++ b/pidl/tests/ndr_array.pl
diff --git a/source4/pidl/tests/ndr_compat.pl b/pidl/tests/ndr_compat.pl
index 355e7f67323..355e7f67323 100755
--- a/source4/pidl/tests/ndr_compat.pl
+++ b/pidl/tests/ndr_compat.pl
diff --git a/source4/pidl/tests/ndr_deprecations.pl b/pidl/tests/ndr_deprecations.pl
index 86828e59825..86828e59825 100755
--- a/source4/pidl/tests/ndr_deprecations.pl
+++ b/pidl/tests/ndr_deprecations.pl
diff --git a/source4/pidl/tests/ndr_fullptr.pl b/pidl/tests/ndr_fullptr.pl
index cc6fca7ab39..cc6fca7ab39 100755
--- a/source4/pidl/tests/ndr_fullptr.pl
+++ b/pidl/tests/ndr_fullptr.pl
diff --git a/source4/pidl/tests/ndr_refptr.pl b/pidl/tests/ndr_refptr.pl
index d5dd83957a4..d5dd83957a4 100755
--- a/source4/pidl/tests/ndr_refptr.pl
+++ b/pidl/tests/ndr_refptr.pl
diff --git a/source4/pidl/tests/ndr_represent.pl b/pidl/tests/ndr_represent.pl
index 2d65fb92b09..2d65fb92b09 100755
--- a/source4/pidl/tests/ndr_represent.pl
+++ b/pidl/tests/ndr_represent.pl
diff --git a/source4/pidl/tests/ndr_simple.pl b/pidl/tests/ndr_simple.pl
index 15e07d56934..15e07d56934 100755
--- a/source4/pidl/tests/ndr_simple.pl
+++ b/pidl/tests/ndr_simple.pl
diff --git a/source4/pidl/tests/ndr_string.pl b/pidl/tests/ndr_string.pl
index 2f2d9416654..2f2d9416654 100755
--- a/source4/pidl/tests/ndr_string.pl
+++ b/pidl/tests/ndr_string.pl
diff --git a/source4/pidl/tests/ndr_tagtype.pl b/pidl/tests/ndr_tagtype.pl
index 3f9b717bfef..3f9b717bfef 100755
--- a/source4/pidl/tests/ndr_tagtype.pl
+++ b/pidl/tests/ndr_tagtype.pl
diff --git a/source4/pidl/tests/parse_idl.pl b/pidl/tests/parse_idl.pl
index 9d43ddccc7a..9d43ddccc7a 100755
--- a/source4/pidl/tests/parse_idl.pl
+++ b/pidl/tests/parse_idl.pl
diff --git a/source4/pidl/tests/samba-ejs.pl b/pidl/tests/samba-ejs.pl
index 094d37a103b..094d37a103b 100755
--- a/source4/pidl/tests/samba-ejs.pl
+++ b/pidl/tests/samba-ejs.pl
diff --git a/source4/pidl/tests/samba-ndr.pl b/pidl/tests/samba-ndr.pl
index cdfe0514f1f..cdfe0514f1f 100755
--- a/source4/pidl/tests/samba-ndr.pl
+++ b/pidl/tests/samba-ndr.pl
diff --git a/source4/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl
index d7629541597..d7629541597 100755
--- a/source4/pidl/tests/samba3-cli.pl
+++ b/pidl/tests/samba3-cli.pl
diff --git a/source4/pidl/tests/samba3-srv.pl b/pidl/tests/samba3-srv.pl
index d1e2bc9545a..d1e2bc9545a 100644
--- a/source4/pidl/tests/samba3-srv.pl
+++ b/pidl/tests/samba3-srv.pl
diff --git a/source4/pidl/tests/tdr.pl b/pidl/tests/tdr.pl
index d6cd7a03d4c..d6cd7a03d4c 100755
--- a/source4/pidl/tests/tdr.pl
+++ b/pidl/tests/tdr.pl
diff --git a/source4/pidl/tests/test_util.pl b/pidl/tests/test_util.pl
index 2d59f6283bb..2d59f6283bb 100755
--- a/source4/pidl/tests/test_util.pl
+++ b/pidl/tests/test_util.pl
diff --git a/source4/pidl/tests/typelist.pl b/pidl/tests/typelist.pl
index 54f4d345865..54f4d345865 100755
--- a/source4/pidl/tests/typelist.pl
+++ b/pidl/tests/typelist.pl
diff --git a/source4/pidl/tests/util.pl b/pidl/tests/util.pl
index cb77f34c510..cb77f34c510 100755
--- a/source4/pidl/tests/util.pl
+++ b/pidl/tests/util.pl
diff --git a/source4/pidl/tests/wireshark-conf.pl b/pidl/tests/wireshark-conf.pl
index 9da5c7d1ed9..9da5c7d1ed9 100755
--- a/source4/pidl/tests/wireshark-conf.pl
+++ b/pidl/tests/wireshark-conf.pl
diff --git a/source4/pidl/tests/wireshark-ndr.pl b/pidl/tests/wireshark-ndr.pl
index 8c2cd47584b..8c2cd47584b 100755
--- a/source4/pidl/tests/wireshark-ndr.pl
+++ b/pidl/tests/wireshark-ndr.pl
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1b0624a3048..29f76a1940e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1061,8 +1061,8 @@ LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
 WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o
 WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ)
 
-POPT_OBJ=../popt/findme.o ../popt/popt.o ../popt/poptconfig.o \
-          ../popt/popthelp.o ../popt/poptparse.o
+POPT_OBJ=../lib/popt/findme.o ../lib/popt/popt.o ../lib/popt/poptconfig.o \
+          ../lib/popt/popthelp.o ../lib/popt/poptparse.o
 
 INIPARSER_OBJ = iniparser_build/iniparser.o iniparser_build/dictionary.o \
 		iniparser_build/strlib.o
@@ -1175,7 +1175,7 @@ samba3-idl::
 		epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
 		dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl drsblobs.idl \
 		nbt.idl" \
-		CPP="$(CPP)" PIDL="../source4/pidl/pidl" \
+		CPP="$(CPP)" PIDL="../pidl/pidl" \
 	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)