From 21f5c53ae76fe1d57b12b248c1ff9691c0d9033e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Tue, 5 Jul 2016 15:30:38 +0100
Subject: Rename PIDL Makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise it will get overwritten by the in-tree cmake build.

Issue reported by Rémy Léone.

Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f
Reviewed-on: https://code.wireshark.org/review/16305
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 .gitignore                         |   1 -
 epan/dissectors/pidl/Makefile      | 153 -------------------------------------
 epan/dissectors/pidl/Makefile.pidl | 153 +++++++++++++++++++++++++++++++++++++
 epan/dissectors/pidl/README        |   2 +-
 4 files changed, 154 insertions(+), 155 deletions(-)
 delete mode 100644 epan/dissectors/pidl/Makefile
 create mode 100644 epan/dissectors/pidl/Makefile.pidl

diff --git a/.gitignore b/.gitignore
index deebf83e06..f375a41d0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,7 +114,6 @@ tvbtest
 wireshark
 wmem_test
 ylwrap
-!/epan/dissectors/pidl/Makefile
 
 # CMake #
 ##################
diff --git a/epan/dissectors/pidl/Makefile b/epan/dissectors/pidl/Makefile
deleted file mode 100644
index 66e8e5d2f7..0000000000
--- a/epan/dissectors/pidl/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-# Makefile
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 2004 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-PIDL = ../../../../tools/pidl/pidl --ws-parser
-
-pidl_out = --outputdir ../..
-pidl_inc = --includedir ..
-
-SUBDIRS = \
-	atsvc		\
-	dfs		\
-	dnsserver	\
-	dssetup		\
-	efs		\
-	eventlog	\
-	frsrpc		\
-	frstrans	\
-	initshutdown	\
-	lsa		\
-	mapi		\
-	mdssvc		\
-	misc		\
-	nspi		\
-	rfr		\
-	samr		\
-	winreg		\
-	witness		\
-	wzcsvc
-
-DONT_BUILD_SUBDIRS = \
-	srvsvc	\
-	wkssvc
-
-all: $(SUBDIRS)
-
-.PHONY: $(SUBDIRS) $(DONT_BUILD_SUBDIRS)
-
-$(SUBDIRS) $(DONT_BUILD_SUBDIRS): %: ../packet-dcerpc-%.c ../packet-dcerpc-%.h
-
-../packet-dcerpc-atsvc.c \
-../packet-dcerpc-atsvc.h: atsvc/atsvc.idl atsvc/atsvc.cnf
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-dfs.c \
-../packet-dcerpc-dfs.h: dfs/dfs.idl dfs/dfs.cnf
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-dnsserver.c \
-../packet-dcerpc-dnsserver.h: dnsserver/dnsserver.idl dnsserver/dnsserver.cnf
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-dssetup.c \
-../packet-dcerpc-dssetup.h: dssetup/dssetup.idl misc/misc.idl
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-efs.c \
-../packet-dcerpc-efs.h: efs/efs.idl efs/efs.cnf
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-eventlog.c \
-../packet-dcerpc-eventlog.h: eventlog/eventlog.idl eventlog/eventlog.cnf \
-				idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-frsrpc.c \
-../packet-dcerpc-frsrpc.h: frsrpc/frsrpc.idl frsrpc/frsrpc.cnf \
-				misc/misc.idl idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-frstrans.c \
-../packet-dcerpc-frstrans.h: frstrans/frstrans.idl frstrans/frstrans.cnf \
-				misc/misc.idl idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-initshutdown.c \
-../packet-dcerpc-initshutdown.h: initshutdown/initshutdown.idl \
-					initshutdown/initshutdown.cnf \
-					lsa/lsa.idl idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-lsa.c \
-../packet-dcerpc-lsa.h: lsa/lsa.idl lsa/lsa.cnf idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-mapi.c \
-../packet-dcerpc-mapi.h: mapi/mapi.idl mapi/mapi.cnf \
-				mapi/request.cnf.c mapi/response.cnf.c \
-				idl_types.h mapicodes_enum.h mapitags_enum.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-mdssvc.c \
-../packet-dcerpc-mdssvc.h: mdssvc/mdssvc.idl mdssvc/mdssvc.cnf \
-				misc/misc.idl
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-misc.c \
-../packet-dcerpc-misc.h: misc/misc.idl misc/misc.cnf idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-nspi.c \
-../packet-dcerpc-nspi.h: nspi/nspi.idl nspi/nspi.cnf \
-				idl_types.h mapicodes_enum.h mapitags_enum.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-rfr.c \
-../packet-dcerpc-rfr.h: rfr/rfr.idl rfr/rfr.cnf \
-				idl_types.h  mapicodes_enum.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-samr.c \
-../packet-dcerpc-samr.h: samr/samr.idl samr/samr.cnf idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-srvsvc.c \
-../packet-dcerpc-srvsvc.h: srvsvc/srvsvc.idl srvsvc/srvsvc.cnf idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-winreg.c \
-../packet-dcerpc-winreg.h: winreg/winreg.idl winreg/winreg.cnf \
-				misc/misc.idl
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-witness.c \
-../packet-dcerpc-witness.h: witness/witness.idl witness/witness.cnf \
-				misc/misc.idl  idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-wkssvc.c \
-../packet-dcerpc-wkssvc.h: wkssvc/wkssvc.idl wkssvc/wkssvc.cnf \
-				lsa/lsa.idl srvsvc/srvsvc.idl \
-				idl_types.h
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
-
-../packet-dcerpc-wzcsvc.c \
-../packet-dcerpc-wzcsvc.h: wzcsvc/wzcsvc.idl wzcsvc/wzcsvc.cnf
-	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
diff --git a/epan/dissectors/pidl/Makefile.pidl b/epan/dissectors/pidl/Makefile.pidl
new file mode 100644
index 0000000000..66e8e5d2f7
--- /dev/null
+++ b/epan/dissectors/pidl/Makefile.pidl
@@ -0,0 +1,153 @@
+# Makefile
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 2004 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+PIDL = ../../../../tools/pidl/pidl --ws-parser
+
+pidl_out = --outputdir ../..
+pidl_inc = --includedir ..
+
+SUBDIRS = \
+	atsvc		\
+	dfs		\
+	dnsserver	\
+	dssetup		\
+	efs		\
+	eventlog	\
+	frsrpc		\
+	frstrans	\
+	initshutdown	\
+	lsa		\
+	mapi		\
+	mdssvc		\
+	misc		\
+	nspi		\
+	rfr		\
+	samr		\
+	winreg		\
+	witness		\
+	wzcsvc
+
+DONT_BUILD_SUBDIRS = \
+	srvsvc	\
+	wkssvc
+
+all: $(SUBDIRS)
+
+.PHONY: $(SUBDIRS) $(DONT_BUILD_SUBDIRS)
+
+$(SUBDIRS) $(DONT_BUILD_SUBDIRS): %: ../packet-dcerpc-%.c ../packet-dcerpc-%.h
+
+../packet-dcerpc-atsvc.c \
+../packet-dcerpc-atsvc.h: atsvc/atsvc.idl atsvc/atsvc.cnf
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-dfs.c \
+../packet-dcerpc-dfs.h: dfs/dfs.idl dfs/dfs.cnf
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-dnsserver.c \
+../packet-dcerpc-dnsserver.h: dnsserver/dnsserver.idl dnsserver/dnsserver.cnf
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-dssetup.c \
+../packet-dcerpc-dssetup.h: dssetup/dssetup.idl misc/misc.idl
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-efs.c \
+../packet-dcerpc-efs.h: efs/efs.idl efs/efs.cnf
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-eventlog.c \
+../packet-dcerpc-eventlog.h: eventlog/eventlog.idl eventlog/eventlog.cnf \
+				idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-frsrpc.c \
+../packet-dcerpc-frsrpc.h: frsrpc/frsrpc.idl frsrpc/frsrpc.cnf \
+				misc/misc.idl idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-frstrans.c \
+../packet-dcerpc-frstrans.h: frstrans/frstrans.idl frstrans/frstrans.cnf \
+				misc/misc.idl idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-initshutdown.c \
+../packet-dcerpc-initshutdown.h: initshutdown/initshutdown.idl \
+					initshutdown/initshutdown.cnf \
+					lsa/lsa.idl idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-lsa.c \
+../packet-dcerpc-lsa.h: lsa/lsa.idl lsa/lsa.cnf idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-mapi.c \
+../packet-dcerpc-mapi.h: mapi/mapi.idl mapi/mapi.cnf \
+				mapi/request.cnf.c mapi/response.cnf.c \
+				idl_types.h mapicodes_enum.h mapitags_enum.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-mdssvc.c \
+../packet-dcerpc-mdssvc.h: mdssvc/mdssvc.idl mdssvc/mdssvc.cnf \
+				misc/misc.idl
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-misc.c \
+../packet-dcerpc-misc.h: misc/misc.idl misc/misc.cnf idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-nspi.c \
+../packet-dcerpc-nspi.h: nspi/nspi.idl nspi/nspi.cnf \
+				idl_types.h mapicodes_enum.h mapitags_enum.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-rfr.c \
+../packet-dcerpc-rfr.h: rfr/rfr.idl rfr/rfr.cnf \
+				idl_types.h  mapicodes_enum.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-samr.c \
+../packet-dcerpc-samr.h: samr/samr.idl samr/samr.cnf idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-srvsvc.c \
+../packet-dcerpc-srvsvc.h: srvsvc/srvsvc.idl srvsvc/srvsvc.cnf idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-winreg.c \
+../packet-dcerpc-winreg.h: winreg/winreg.idl winreg/winreg.cnf \
+				misc/misc.idl
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-witness.c \
+../packet-dcerpc-witness.h: witness/witness.idl witness/witness.cnf \
+				misc/misc.idl  idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-wkssvc.c \
+../packet-dcerpc-wkssvc.h: wkssvc/wkssvc.idl wkssvc/wkssvc.cnf \
+				lsa/lsa.idl srvsvc/srvsvc.idl \
+				idl_types.h
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
+
+../packet-dcerpc-wzcsvc.c \
+../packet-dcerpc-wzcsvc.h: wzcsvc/wzcsvc.idl wzcsvc/wzcsvc.cnf
+	cd $(<D) && $(PIDL) $(pidl_out) $(pidl_inc) -- $(<F)
diff --git a/epan/dissectors/pidl/README b/epan/dissectors/pidl/README
index f275671db4..74cba21b09 100644
--- a/epan/dissectors/pidl/README
+++ b/epan/dissectors/pidl/README
@@ -4,7 +4,7 @@ A note about PIDL generated files
 Quick guide
 ===========
 
-Run 'make all' inside the pidl folder to generate all the dissectors and place
+Run 'make -f Makefile.pidl all' inside the pidl folder to generate all the dissectors and place
 them in the epan/dissectors folder.
 
 Complete infos
-- 
cgit v1.2.3