3 files changed, 28 insertions, 49 deletions
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 11b0414bfc..4d8585e104 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -63,15 +63,35 @@ ADD_CUSTOM_COMMAND(
 )
 
 if (AUTOGEN_dcerpc)
-  set(PIDL_DISSECTOR_AUTOGEN_SRC
-	  dcerpc/budb/packet-dcerpc-budb.c
-	  dcerpc/butc/packet-dcerpc-butc.c
-	  dcerpc/drsuapi/packet-dcerpc-drsuapi.c
+  set(PIDL_DISSECTOR_AUTOGEN_NAMES
+	  budb
+	  butc
+	  drsuapi
   ) 
-  set_source_files_properties(${PIDL_DISSECTOR_AUTOGEN_SRC}
-	  PROPERTIES 
-	    GENERATED TRUE
-  )
+
+  FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
+    set(PIDL_DISSECTOR_AUTOGEN_SRC 
+	${PIDL_DISSECTOR_AUTOGEN_SRC}
+	dcerpc/${PROTOCOL_NAME}/packet-dcerpc-${PROTOCOL_NAME}.c
+    )
+  ENDFOREACH()
+
+  FOREACH(PROTOCOL_NAME ${PIDL_DISSECTOR_AUTOGEN_NAMES})
+    ADD_CUSTOM_COMMAND(
+	OUTPUT
+	  ${CMAKE_CURRENT_SOURCE_DIR}/dcerpc/${PROTOCOL_NAME}/packet-dcerpc-${PROTOCOL_NAME}.c
+	  ${CMAKE_CURRENT_SOURCE_DIR}/dcerpc/${PROTOCOL_NAME}/packet-dcerpc-${PROTOCOL_NAME}.h
+	COMMAND
+	  idl2wrs ${PROTOCOL_NAME}
+	WORKING_DIRECTORY
+	  ${CMAKE_CURRENT_SOURCE_DIR}/dcerpc/${PROTOCOL_NAME}
+	DEPENDS
+	  dcerpc/${PROTOCOL_NAME}/${PROTOCOL_NAME}.idl
+	  dcerpc/${PROTOCOL_NAME}/${PROTOCOL_NAME}.cnf
+	  dcerpc/${PROTOCOL_NAME}/packet-dcerpc-${PROTOCOL_NAME}-template.c 
+	  dcerpc/${PROTOCOL_NAME}/packet-dcerpc-${PROTOCOL_NAME}-template.h
+    )
+  ENDFOREACH()
 else()
   set(PIDL_DISSECTOR_AUTOGEN_SRC
 	  packet-dcerpc-budb.c
diff --git a/epan/dissectors/dcerpc/CMakeLists.txt b/epan/dissectors/dcerpc/CMakeLists.txt
index 3e71ea9f0b..73497e52df 100644
--- a/epan/dissectors/dcerpc/CMakeLists.txt
+++ b/epan/dissectors/dcerpc/CMakeLists.txt
@@ -21,8 +21,4 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-add_subdirectory( budb )
-add_subdirectory( butc )
-add_subdirectory( drsuapi )
-
 add_executable(idl2wrs idl2wrs.c)
diff --git a/epan/dissectors/dcerpc/budb/CMakeLists.txt b/epan/dissectors/dcerpc/budb/CMakeLists.txt
deleted file mode 100644
index 98bcf8e499..0000000000
--- a/epan/dissectors/dcerpc/budb/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# CMakeLists.txt
-#
-# $Id$
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-
-set( PROTOCOL_NAME budb )
-
-ADD_CUSTOM_COMMAND(
-    OUTPUT
-      packet-dcerpc-${PROTOCOL_NAME}.c
-      packet-dcerpc-${PROTOCOL_NAME}.h
-    COMMAND
-      idl2wrs ${PROTOCOL_NAME}
-    DEPENDS
-      ${PROTOCOL_NAME}.idl
-      ${PROTOCOL_NAME}.cnf
-      packet-dcerpc-${PROTOCOL_NAME}-template.c 
-      packet-dcerpc-${PROTOCOL_NAME}-template.h
-)