channels: moved client-side implementations in client subdirectories

channels/cliprdr/CMakeLists.txt

@@ -1,9 +1,7 @@
 # FreeRDP: A Remote Desktop Protocol Client
 # FreeRDP cmake build script
 #
-# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(CLIPRDR_SRCS
+add_subdirectory(client)
-	cliprdr_constants.h
-	cliprdr_format.c
-	cliprdr_format.h
-	cliprdr_main.c
-	cliprdr_main.h)
 
-add_library(cliprdr ${CLIPRDR_SRCS})
-set_target_properties(cliprdr PROPERTIES PREFIX "")
-
-if(WITH_MONOLITHIC_BUILD)
-	target_link_libraries(cliprdr freerdp)
-else()
-	target_link_libraries(cliprdr freerdp-utils)
-endif()
-
-install(TARGETS cliprdr DESTINATION ${FREERDP_PLUGIN_PATH})

channels/cliprdr/client/CMakeLists.txt

@@ -0,0 +1,36 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# FreeRDP cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(CLIPRDR_SRCS
+	cliprdr_constants.h
+	cliprdr_format.c
+	cliprdr_format.h
+	cliprdr_main.c
+	cliprdr_main.h)
+
+add_library(cliprdr ${CLIPRDR_SRCS})
+set_target_properties(cliprdr PROPERTIES PREFIX "")
+
+if(WITH_MONOLITHIC_BUILD)
+	target_link_libraries(cliprdr freerdp)
+else()
+	target_link_libraries(cliprdr freerdp-utils)
+endif()
+
+install(TARGETS cliprdr DESTINATION ${FREERDP_PLUGIN_PATH})

channels/drdynvc/CMakeLists.txt

@@ -1,9 +1,7 @@
 # FreeRDP: A Remote Desktop Protocol Client
 # FreeRDP cmake build script
 #
-# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,27 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(DRDYNVC_SRCS
+add_subdirectory(client)
-	drdynvc_main.c
-	drdynvc_main.h
-	drdynvc_types.h
-	dvcman.c
-	dvcman.h
-)
 
-add_library(drdynvc ${DRDYNVC_SRCS})
-set_target_properties(drdynvc PROPERTIES PREFIX "")
-
-if(WITH_MONOLITHIC_BUILD)
-	target_link_libraries(drdynvc freerdp)
-else()
-	target_link_libraries(drdynvc freerdp-utils)
-endif()
-
-install(TARGETS drdynvc DESTINATION ${FREERDP_PLUGIN_PATH})
-
-if(NOT WIN32)
-	add_subdirectory(tsmf)
-endif()
-
-add_subdirectory(audin)

channels/drdynvc/client/CMakeLists.txt

@@ -0,0 +1,43 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# FreeRDP cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(DRDYNVC_SRCS
+	drdynvc_main.c
+	drdynvc_main.h
+	drdynvc_types.h
+	dvcman.c
+	dvcman.h
+)
+
+add_library(drdynvc ${DRDYNVC_SRCS})
+set_target_properties(drdynvc PROPERTIES PREFIX "")
+
+if(WITH_MONOLITHIC_BUILD)
+	target_link_libraries(drdynvc freerdp)
+else()
+	target_link_libraries(drdynvc freerdp-utils)
+endif()
+
+install(TARGETS drdynvc DESTINATION ${FREERDP_PLUGIN_PATH})
+
+if(NOT WIN32)
+	add_subdirectory(tsmf)
+endif()
+
+add_subdirectory(audin)

channels/rail/CMakeLists.txt

@@ -1,9 +1,7 @@
 # FreeRDP: A Remote Desktop Protocol Client
 # FreeRDP cmake build script
 #
-# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(RAIL_SRCS
+add_subdirectory(client)
-	rail_main.c
-	rail_main.h
-	rail_orders.c
-	rail_orders.h)
-
-add_library(rail ${RAIL_SRCS})
-set_target_properties(rail PROPERTIES PREFIX "")
-
-if(WITH_MONOLITHIC_BUILD)
-	target_link_libraries(rail freerdp)
-else()
-	target_link_libraries(rail freerdp-utils)
-endif()
-
-install(TARGETS rail DESTINATION ${FREERDP_PLUGIN_PATH})
 

channels/rail/client/CMakeLists.txt

@@ -0,0 +1,36 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# FreeRDP cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(RAIL_SRCS
+	rail_main.c
+	rail_main.h
+	rail_orders.c
+	rail_orders.h)
+
+add_library(rail ${RAIL_SRCS})
+set_target_properties(rail PROPERTIES PREFIX "")
+
+if(WITH_MONOLITHIC_BUILD)
+	target_link_libraries(rail freerdp)
+else()
+	target_link_libraries(rail freerdp-utils)
+endif()
+
+install(TARGETS rail DESTINATION ${FREERDP_PLUGIN_PATH})
+

channels/rdpdr/CMakeLists.txt

@@ -1,9 +1,7 @@
 # FreeRDP: A Remote Desktop Protocol Client
 # FreeRDP cmake build script
 #
-# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,36 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(RDPDR_SRCS
+add_subdirectory(client)
-	rdpdr_constants.h
-	rdpdr_types.h
-	rdpdr_capabilities.c
-	rdpdr_capabilities.h
-	devman.c
-	devman.h
-	irp.c
-	irp.h
-	rdpdr_main.c
-	rdpdr_main.h)
 
-add_library(rdpdr ${RDPDR_SRCS})
-set_target_properties(rdpdr PROPERTIES PREFIX "")
-
-if(WITH_MONOLITHIC_BUILD)
-	target_link_libraries(rdpdr freerdp)
-else()
-	target_link_libraries(rdpdr freerdp-utils)
-endif()
-
-install(TARGETS rdpdr DESTINATION ${FREERDP_PLUGIN_PATH})
-
-if(NOT WIN32)
-	add_subdirectory(disk)
-	add_subdirectory(printer)
-	add_subdirectory(parallel)
-	add_subdirectory(serial)
-endif()
-
-if(WITH_PCSC)
-	add_subdirectory(smartcard)
-endif()

channels/rdpdr/client/CMakeLists.txt

@@ -0,0 +1,52 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# FreeRDP cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(RDPDR_SRCS
+	rdpdr_constants.h
+	rdpdr_types.h
+	rdpdr_capabilities.c
+	rdpdr_capabilities.h
+	devman.c
+	devman.h
+	irp.c
+	irp.h
+	rdpdr_main.c
+	rdpdr_main.h)
+
+add_library(rdpdr ${RDPDR_SRCS})
+set_target_properties(rdpdr PROPERTIES PREFIX "")
+
+if(WITH_MONOLITHIC_BUILD)
+	target_link_libraries(rdpdr freerdp)
+else()
+	target_link_libraries(rdpdr freerdp-utils)
+endif()
+
+install(TARGETS rdpdr DESTINATION ${FREERDP_PLUGIN_PATH})
+
+if(NOT WIN32)
+	add_subdirectory(disk)
+	add_subdirectory(printer)
+	add_subdirectory(parallel)
+	add_subdirectory(serial)
+endif()
+
+if(WITH_PCSC)
+	add_subdirectory(smartcard)
+endif()

channels/rdpsnd/CMakeLists.txt

@@ -1,9 +1,7 @@
 # FreeRDP: A Remote Desktop Protocol Client
 # FreeRDP cmake build script
 #
-# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,30 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(RDPSND_SRCS
+add_subdirectory(client)
-	rdpsnd_main.c
-	rdpsnd_main.h)
-
-add_library(rdpsnd ${RDPSND_SRCS})
-set_target_properties(rdpsnd PROPERTIES PREFIX "")
-
-if(WITH_MONOLITHIC_BUILD)
-	target_link_libraries(rdpsnd freerdp)
-else()
-	target_link_libraries(rdpsnd freerdp-utils)
-endif()
-
-install(TARGETS rdpsnd DESTINATION ${FREERDP_PLUGIN_PATH})
-
-if(WITH_ALSA)
-	add_subdirectory(alsa)
-endif()
-
-if(WITH_PULSEAUDIO)
-	add_subdirectory(pulse)
-endif()
-
-if(WITH_MACAUDIO)
-	add_subdirectory(mac_audio)
-endif()
 

channels/rdpsnd/client/CMakeLists.txt

@@ -0,0 +1,46 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# FreeRDP cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(RDPSND_SRCS
+	rdpsnd_main.c
+	rdpsnd_main.h)
+
+add_library(rdpsnd ${RDPSND_SRCS})
+set_target_properties(rdpsnd PROPERTIES PREFIX "")
+
+if(WITH_MONOLITHIC_BUILD)
+	target_link_libraries(rdpsnd freerdp)
+else()
+	target_link_libraries(rdpsnd freerdp-utils)
+endif()
+
+install(TARGETS rdpsnd DESTINATION ${FREERDP_PLUGIN_PATH})
+
+if(WITH_ALSA)
+	add_subdirectory(alsa)
+endif()
+
+if(WITH_PULSEAUDIO)
+	add_subdirectory(pulse)
+endif()
+
+if(WITH_MACAUDIO)
+	add_subdirectory(mac_audio)
+endif()
+

channels/skel/CMakeLists.txt

@@ -1,9 +1,7 @@
 # FreeRDP: A Remote Desktop Protocol Client
 # FreeRDP cmake build script
 #
-# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
-# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
-# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,17 +15,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(SKEL_SRCS
+add_subdirectory(client)
-	skel_main.c
-	skel_main.h)
 
-add_library(skel ${SKEL_SRCS})
-set_target_properties(skel PROPERTIES PREFIX "")
-
-if(WITH_MONOLITHIC_BUILD)
-	target_link_libraries(skel freerdp)
-else()
-	target_link_libraries(skel freerdp-utils)
-endif()
-
-install(TARGETS skel DESTINATION ${FREERDP_PLUGIN_PATH})

channels/skel/client/CMakeLists.txt

@@ -0,0 +1,33 @@
+# FreeRDP: A Remote Desktop Protocol Client
+# FreeRDP cmake build script
+#
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(SKEL_SRCS
+	skel_main.c
+	skel_main.h)
+
+add_library(skel ${SKEL_SRCS})
+set_target_properties(skel PROPERTIES PREFIX "")
+
+if(WITH_MONOLITHIC_BUILD)
+	target_link_libraries(skel freerdp)
+else()
+	target_link_libraries(skel freerdp-utils)
+endif()
+
+install(TARGETS skel DESTINATION ${FREERDP_PLUGIN_PATH})