diff --git a/source4/pidl/MANIFEST b/pidl/MANIFEST similarity index 100% rename from source4/pidl/MANIFEST rename to pidl/MANIFEST diff --git a/source4/pidl/META.yml b/pidl/META.yml similarity index 100% rename from source4/pidl/META.yml rename to pidl/META.yml diff --git a/source4/pidl/Makefile.PL b/pidl/Makefile.PL similarity index 100% rename from source4/pidl/Makefile.PL rename to pidl/Makefile.PL diff --git a/source4/pidl/README b/pidl/README similarity index 100% rename from source4/pidl/README rename to pidl/README diff --git a/source4/pidl/TODO b/pidl/TODO similarity index 100% rename from source4/pidl/TODO rename to pidl/TODO diff --git a/source4/pidl/config.m4 b/pidl/config.m4 similarity index 100% rename from source4/pidl/config.m4 rename to pidl/config.m4 diff --git a/source4/pidl/config.mk b/pidl/config.mk similarity index 100% rename from source4/pidl/config.mk rename to pidl/config.mk diff --git a/source4/pidl/expr.yp b/pidl/expr.yp similarity index 100% rename from source4/pidl/expr.yp rename to pidl/expr.yp diff --git a/source4/pidl/idl.yp b/pidl/idl.yp similarity index 100% rename from source4/pidl/idl.yp rename to pidl/idl.yp diff --git a/source4/pidl/lib/Parse/Pidl.pm b/pidl/lib/Parse/Pidl.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl.pm rename to pidl/lib/Parse/Pidl.pm diff --git a/source4/pidl/lib/Parse/Pidl/CUtil.pm b/pidl/lib/Parse/Pidl/CUtil.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/CUtil.pm rename to pidl/lib/Parse/Pidl/CUtil.pm diff --git a/source4/pidl/lib/Parse/Pidl/Compat.pm b/pidl/lib/Parse/Pidl/Compat.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Compat.pm rename to pidl/lib/Parse/Pidl/Compat.pm diff --git a/source4/pidl/lib/Parse/Pidl/Dump.pm b/pidl/lib/Parse/Pidl/Dump.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Dump.pm rename to pidl/lib/Parse/Pidl/Dump.pm diff --git a/source4/pidl/lib/Parse/Pidl/Expr.pm b/pidl/lib/Parse/Pidl/Expr.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Expr.pm rename to pidl/lib/Parse/Pidl/Expr.pm diff --git a/source4/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/IDL.pm rename to pidl/lib/Parse/Pidl/IDL.pm diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/NDR.pm rename to pidl/lib/Parse/Pidl/NDR.pm diff --git a/source4/pidl/lib/Parse/Pidl/ODL.pm b/pidl/lib/Parse/Pidl/ODL.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/ODL.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm rename to pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm diff --git a/source4/pidl/lib/Parse/Pidl/Samba4.pm b/pidl/lib/Parse/Pidl/Samba4.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/COM/Header.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/COM/Stub.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/Header.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/Python.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/SWIG.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/TDR.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Samba4/Template.pm rename to pidl/lib/Parse/Pidl/Samba4/Template.pm diff --git a/source4/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Typelist.pm rename to pidl/lib/Parse/Pidl/Typelist.pm diff --git a/source4/pidl/lib/Parse/Pidl/Util.pm b/pidl/lib/Parse/Pidl/Util.pm similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Util.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm rename to 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 similarity index 100% rename from source4/pidl/lib/Parse/Pidl/Wireshark/NDR.pm rename to pidl/lib/Parse/Pidl/Wireshark/NDR.pm diff --git a/source4/pidl/lib/Parse/Yapp/Driver.pm b/pidl/lib/Parse/Yapp/Driver.pm similarity index 100% rename from source4/pidl/lib/Parse/Yapp/Driver.pm rename to pidl/lib/Parse/Yapp/Driver.pm diff --git a/source4/pidl/pidl b/pidl/pidl similarity index 100% rename from source4/pidl/pidl rename to pidl/pidl diff --git a/source4/pidl/tests/Util.pm b/pidl/tests/Util.pm similarity index 100% rename from source4/pidl/tests/Util.pm rename to pidl/tests/Util.pm diff --git a/source4/pidl/tests/cutil.pl b/pidl/tests/cutil.pl similarity index 100% rename from source4/pidl/tests/cutil.pl rename to pidl/tests/cutil.pl diff --git a/source4/pidl/tests/dump.pl b/pidl/tests/dump.pl similarity index 100% rename from source4/pidl/tests/dump.pl rename to pidl/tests/dump.pl diff --git a/source4/pidl/tests/header.pl b/pidl/tests/header.pl similarity index 100% rename from source4/pidl/tests/header.pl rename to pidl/tests/header.pl diff --git a/source4/pidl/tests/ndr.pl b/pidl/tests/ndr.pl similarity index 100% rename from source4/pidl/tests/ndr.pl rename to pidl/tests/ndr.pl diff --git a/source4/pidl/tests/ndr_align.pl b/pidl/tests/ndr_align.pl similarity index 100% rename from source4/pidl/tests/ndr_align.pl rename to pidl/tests/ndr_align.pl diff --git a/source4/pidl/tests/ndr_alloc.pl b/pidl/tests/ndr_alloc.pl similarity index 100% rename from source4/pidl/tests/ndr_alloc.pl rename to pidl/tests/ndr_alloc.pl diff --git a/source4/pidl/tests/ndr_array.pl b/pidl/tests/ndr_array.pl similarity index 100% rename from source4/pidl/tests/ndr_array.pl rename to pidl/tests/ndr_array.pl diff --git a/source4/pidl/tests/ndr_compat.pl b/pidl/tests/ndr_compat.pl similarity index 100% rename from source4/pidl/tests/ndr_compat.pl rename to pidl/tests/ndr_compat.pl diff --git a/source4/pidl/tests/ndr_deprecations.pl b/pidl/tests/ndr_deprecations.pl similarity index 100% rename from source4/pidl/tests/ndr_deprecations.pl rename to pidl/tests/ndr_deprecations.pl diff --git a/source4/pidl/tests/ndr_fullptr.pl b/pidl/tests/ndr_fullptr.pl similarity index 100% rename from source4/pidl/tests/ndr_fullptr.pl rename to pidl/tests/ndr_fullptr.pl diff --git a/source4/pidl/tests/ndr_refptr.pl b/pidl/tests/ndr_refptr.pl similarity index 100% rename from source4/pidl/tests/ndr_refptr.pl rename to pidl/tests/ndr_refptr.pl diff --git a/source4/pidl/tests/ndr_represent.pl b/pidl/tests/ndr_represent.pl similarity index 100% rename from source4/pidl/tests/ndr_represent.pl rename to pidl/tests/ndr_represent.pl diff --git a/source4/pidl/tests/ndr_simple.pl b/pidl/tests/ndr_simple.pl similarity index 100% rename from source4/pidl/tests/ndr_simple.pl rename to pidl/tests/ndr_simple.pl diff --git a/source4/pidl/tests/ndr_string.pl b/pidl/tests/ndr_string.pl similarity index 100% rename from source4/pidl/tests/ndr_string.pl rename to pidl/tests/ndr_string.pl diff --git a/source4/pidl/tests/ndr_tagtype.pl b/pidl/tests/ndr_tagtype.pl similarity index 100% rename from source4/pidl/tests/ndr_tagtype.pl rename to pidl/tests/ndr_tagtype.pl diff --git a/source4/pidl/tests/parse_idl.pl b/pidl/tests/parse_idl.pl similarity index 100% rename from source4/pidl/tests/parse_idl.pl rename to pidl/tests/parse_idl.pl diff --git a/source4/pidl/tests/samba-ejs.pl b/pidl/tests/samba-ejs.pl similarity index 100% rename from source4/pidl/tests/samba-ejs.pl rename to pidl/tests/samba-ejs.pl diff --git a/source4/pidl/tests/samba-ndr.pl b/pidl/tests/samba-ndr.pl similarity index 100% rename from source4/pidl/tests/samba-ndr.pl rename to pidl/tests/samba-ndr.pl diff --git a/source4/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl similarity index 100% rename from source4/pidl/tests/samba3-cli.pl rename to pidl/tests/samba3-cli.pl diff --git a/source4/pidl/tests/samba3-srv.pl b/pidl/tests/samba3-srv.pl similarity index 100% rename from source4/pidl/tests/samba3-srv.pl rename to pidl/tests/samba3-srv.pl diff --git a/source4/pidl/tests/tdr.pl b/pidl/tests/tdr.pl similarity index 100% rename from source4/pidl/tests/tdr.pl rename to pidl/tests/tdr.pl diff --git a/source4/pidl/tests/test_util.pl b/pidl/tests/test_util.pl similarity index 100% rename from source4/pidl/tests/test_util.pl rename to pidl/tests/test_util.pl diff --git a/source4/pidl/tests/typelist.pl b/pidl/tests/typelist.pl similarity index 100% rename from source4/pidl/tests/typelist.pl rename to pidl/tests/typelist.pl diff --git a/source4/pidl/tests/util.pl b/pidl/tests/util.pl similarity index 100% rename from source4/pidl/tests/util.pl rename to pidl/tests/util.pl diff --git a/source4/pidl/tests/wireshark-conf.pl b/pidl/tests/wireshark-conf.pl similarity index 100% rename from source4/pidl/tests/wireshark-conf.pl rename to pidl/tests/wireshark-conf.pl diff --git a/source4/pidl/tests/wireshark-ndr.pl b/pidl/tests/wireshark-ndr.pl similarity index 100% rename from source4/pidl/tests/wireshark-ndr.pl rename to 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)