Introduce PROTOCOL_NAME variable in makefiles

svn path=/trunk/; revision=30467

3 files changed, 25 insertions, 19 deletions

diff --git a/epan/dissectors/pidl/mapi/Makefile b/epan/dissectors/pidl/mapi/Makefile
index e2a8adace8..def415e0da 100644
--- a/epan/dissectors/pidl/mapi/Makefile
+++ b/epan/dissectors/pidl/mapi/Makefile
@@ -1,16 +1,18 @@
-all: packet-dcerpc-mapi.c packet-dcerpc-mapi.h
+PROTOCOL_NAME=mapi
 
-packet-dcerpc-mapi.c packet-dcerpc-mapi.h: 	mapi.idl 		\
-						mapi.cnf 		\
+all: packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h
+
+packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h: $(PROTOCOL_NAME).idl \
+						$(PROTOCOL_NAME).cnf 		\
 						request.cnf.c		\
 						response.cnf.c		\
 						mapicodes_enum.h  	\
 						mapitags_enum.h 	\
 						../idl_types.h
-	../../../../tools/pidl/pidl --verbose --includedir=.. --ws-parser -- mapi.idl
+	../../../../tools/pidl/pidl --verbose --includedir=.. --ws-parser -- $(PROTOCOL_NAME).idl
 
 clean:
-	rm -f packet-dcerpc-mapi.c packet-dcerpc-mapi.h idl_types.h
+	rm -f packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h idl_types.h
 
-install: packet-dcerpc-mapi.c packet-dcerpc-mapi.h
-	cp packet-dcerpc-mapi.c packet-dcerpc-mapi.h ../../
+install: packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h
+	cp packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h ../../
diff --git a/epan/dissectors/pidl/nspi/Makefile b/epan/dissectors/pidl/nspi/Makefile
index 3bf57b890c..d66ac6698e 100644
--- a/epan/dissectors/pidl/nspi/Makefile
+++ b/epan/dissectors/pidl/nspi/Makefile
@@ -1,10 +1,12 @@
-all: packet-dcerpc-nspi.c packet-dcerpc-nspi.h
+PROTOCOL_NAME=nspi
 
-packet-dcerpc-nspi.c packet-dcerpc-nspi.h: nspi.idl nspi.cnf mapicodes_enum.h  mapitags_enum.h ../idl_types.h
-	../../../../tools/pidl/pidl  --includedir=.. --ws-parser -- nspi.idl
+all: packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h
+
+packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h: $(PROTOCOL_NAME).idl $(PROTOCOL_NAME).cnf mapicodes_enum.h  mapitags_enum.h ../idl_types.h
+	../../../../tools/pidl/pidl  --includedir=.. --ws-parser -- $(PROTOCOL_NAME).idl
 
 clean:
-	rm -f packet-dcerpc-nspi.c packet-dcerpc-nspi.h idl_types.h
+	rm -f packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h idl_types.h
 
-install: packet-dcerpc-nspi.c packet-dcerpc-nspi.h
-	cp packet-dcerpc-nspi.c packet-dcerpc-nspi.h ../../
+install: packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h
+	cp packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h ../../
diff --git a/epan/dissectors/pidl/rfr/Makefile b/epan/dissectors/pidl/rfr/Makefile
index 4f740d9747..4d12989a6b 100644
--- a/epan/dissectors/pidl/rfr/Makefile
+++ b/epan/dissectors/pidl/rfr/Makefile
@@ -1,10 +1,12 @@
-all: packet-dcerpc-rfr.c packet-dcerpc-rfr.h
+PROTOCOL_NAME=rfr
 
-packet-dcerpc-rfr.c packet-dcerpc-rfr.h: rfr.idl rfr.cnf mapicodes_enum.h ../idl_types.h
-	../../../../tools/pidl/pidl --includedir=.. --ws-parser -- rfr.idl
+all: packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h
+
+packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h: $(PROTOCOL_NAME).idl $(PROTOCOL_NAME).cnf mapicodes_enum.h ../idl_types.h
+	../../../../tools/pidl/pidl --includedir=.. --ws-parser -- $(PROTOCOL_NAME).idl
 
 clean:
-	rm -f packet-dcerpc-rfr.c packet-dcerpc-rfr.h idl_types.h
+	rm -f packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h idl_types.h
 
-install: packet-dcerpc-rfr.c packet-dcerpc-rfr.h
-	cp packet-dcerpc-rfr.c packet-dcerpc-rfr.h ../../
+install: packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h
+	cp packet-dcerpc-$(PROTOCOL_NAME).c packet-dcerpc-$(PROTOCOL_NAME).h ../../