[CMAKE]

- Improve drivers' libs.

svn path=/branches/cmake-bringup/; revision=49489

diff --git a/lib/drivers/ip/CMakeLists.txt b/lib/drivers/ip/CMakeLists.txt
index e862503..866d630 100644 (file)
--- a/lib/drivers/ip/CMakeLists.txt
+++ b/lib/drivers/ip/CMakeLists.txt
@@ -1,11 +1,35 @@
+

 add_definitions(-D__NTDRIVER__)
 
 add_definitions(-D__NTDRIVER__)
 

-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include)
-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
+include_directories(
+    BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include
+    ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)

 
 

-file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S)
-file(GLOB_RECURSE SOURCE "*.c")
+if(ARCH MATCHES i386)
+list(APPEND SOURCE network/i386/checksum.S)
+endif()

 
 

-add_library(ip ${ARCH_SOURCE} ${SOURCE})
-add_dependencies(ip bugcodes)
+list(APPEND SOURCE
+    network/address.c
+    network/arp.c
+    network/checksum.c
+    network/icmp.c
+    network/interface.c
+    network/ip.c
+    network/loopback.c
+    network/neighbor.c
+    network/ports.c
+    network/receive.c
+    network/router.c
+    network/routines.c
+    network/transmit.c
+    transport/datagram/datagram.c
+    transport/rawip/rawip.c
+    transport/tcp/accept.c
+    transport/tcp/event.c
+    transport/tcp/if.c
+    transport/tcp/tcp.c
+    transport/udp/udp.c)

 
 

+add_library(ip ${SOURCE})
+add_dependencies(ip bugcodes)

diff --git a/lib/drivers/oskittcp/CMakeLists.txt b/lib/drivers/oskittcp/CMakeLists.txt
index 521f568..232dbd7 100644 (file)
--- a/lib/drivers/oskittcp/CMakeLists.txt
+++ b/lib/drivers/oskittcp/CMakeLists.txt
@@ -1,18 +1,51 @@
 
 

-include_directories(BEFORE include/freebsd/src/sys)
-include_directories(include/freebsd)
-include_directories(include/freebsd/sys/include)
-include_directories(include/freebsd/dev/include)
-include_directories(include/freebsd/net/include)
+include_directories(
+    BEFORE include/freebsd/src/sys
+    include/freebsd
+    include/freebsd/sys/include
+    include/freebsd/dev/include
+    include/freebsd/net/include
+    include)

 
 

-include_directories(include)
+add_definitions(
+    -D__NTDRIVER__
+    -DKERNEL
+    -DOSKIT)

 
 

-add_definitions(-D__NTDRIVER__)
-add_definitions(-DKERNEL)
-add_definitions(-DOSKIT)
-
-file(GLOB_RECURSE SOURCE "oskittcp/*.c")
+list(APPEND SOURCE
+    oskittcp/defaults.c
+    oskittcp/in.c
+    oskittcp/in_cksum.c
+    oskittcp/in_pcb.c
+    oskittcp/in_proto.c
+    oskittcp/in_rmx.c
+    oskittcp/inet_ntoa.c
+    oskittcp/interface.c
+    oskittcp/ip_input.c
+    oskittcp/ip_output.c
+    oskittcp/kern_clock.c
+    oskittcp/kern_subr.c
+    oskittcp/osenv.c
+    oskittcp/param.c
+    oskittcp/radix.c
+    oskittcp/random.c
+    oskittcp/raw_cb.c
+    oskittcp/raw_ip.c
+    oskittcp/raw_usrreq.c
+    oskittcp/route.c
+    oskittcp/rtsock.c
+    oskittcp/scanc.c
+    oskittcp/sleep.c
+    oskittcp/tcp_input.c
+    oskittcp/tcp_output.c
+    oskittcp/tcp_subr.c
+    oskittcp/tcp_usrreq.c
+    oskittcp/tcp_debug.c
+    oskittcp/tcp_timer.c
+    oskittcp/uipc_domain.c
+    oskittcp/uipc_mbuf.c
+    oskittcp/uipc_socket.c
+    oskittcp/uipc_socket2.c)

 
 add_library(oskittcp ${SOURCE})
 add_dependencies(oskittcp bugcodes)
 
 add_library(oskittcp ${SOURCE})
 add_dependencies(oskittcp bugcodes)

-

diff --git a/lib/drivers/sound/legacy/CMakeLists.txt b/lib/drivers/sound/legacy/CMakeLists.txt
index 416f756..3062409 100644 (file)
--- a/lib/drivers/sound/legacy/CMakeLists.txt
+++ b/lib/drivers/sound/legacy/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 

-add_definitions(-D__NTDRIVER__)
-add_definitions(-DKERNEL)
+add_definitions(
+    -D__NTDRIVER__
+    -DKERNEL)

 
 

-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)

 
 

-file(GLOB_RECURSE SOURCE "*.c")
-
-add_library(audioleg ${SOURCE})
+add_library(audioleg devname.c hardware.c)

 add_dependencies(audioleg bugcodes)
 add_dependencies(audioleg bugcodes)

diff --git a/lib/drivers/sound/mmebuddy/CMakeLists.txt b/lib/drivers/sound/mmebuddy/CMakeLists.txt
index 6e6621c..19af978 100644 (file)
--- a/lib/drivers/sound/mmebuddy/CMakeLists.txt
+++ b/lib/drivers/sound/mmebuddy/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 

-add_definitions(-DUNICODE -D_UNICODE)
-add_definitions(-DNDEBUG=1)
+add_definitions(
+    -DUNICODE -D_UNICODE
+    -DNDEBUG=1)

 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 

diff --git a/lib/drivers/sound/mment4/CMakeLists.txt b/lib/drivers/sound/mment4/CMakeLists.txt
index 70bb842..da02da9 100644 (file)
--- a/lib/drivers/sound/mment4/CMakeLists.txt
+++ b/lib/drivers/sound/mment4/CMakeLists.txt
@@ -1,10 +1,14 @@
 
 

-add_definitions(-DUNICODE -D_UNICODE)
-add_definitions(-DDEBUG_NT4=1)
+add_definitions(
+    -DUNICODE -D_UNICODE
+    -DDEBUG_NT4=1)

 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 

-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+    detect.c
+    registry.c
+    control.c)

 
 add_library(mment4 ${SOURCE})
 add_dependencies(mment4 psdk)
 
 add_library(mment4 ${SOURCE})
 add_dependencies(mment4 psdk)

diff --git a/lib/drivers/sound/mmixer/CMakeLists.txt b/lib/drivers/sound/mmixer/CMakeLists.txt
index 2c38b91..3d24393 100644 (file)
--- a/lib/drivers/sound/mmixer/CMakeLists.txt
+++ b/lib/drivers/sound/mmixer/CMakeLists.txt
@@ -1,10 +1,17 @@
 
 

-add_definitions(-DUNICODE -D_UNICODE)
-add_definitions(-DNDEBUG=1)
+add_definitions(
+    -DUNICODE -D_UNICODE
+    -DNDEBUG=1)

 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 

-file(GLOB_RECURSE SOURCE "*.c")
+list(APPEND SOURCE
+    controls.c
+    filter.c
+    mixer.c
+    sup.c
+    wave.c
+    topology.c)

 
 add_library(mmixer ${SOURCE})
 add_dependencies(mmixer bugcodes)
 
 add_library(mmixer ${SOURCE})
 add_dependencies(mmixer bugcodes)

diff --git a/lib/drivers/sound/shared/CMakeLists.txt b/lib/drivers/sound/shared/CMakeLists.txt
index 227618e..8a007d8 100644 (file)
--- a/lib/drivers/sound/shared/CMakeLists.txt
+++ b/lib/drivers/sound/shared/CMakeLists.txt
@@ -1,9 +1,11 @@
 
 

-add_definitions(-D__NTDRIVER__)
-add_definitions(-DKERNEL)
+add_definitions(
+    -D__NTDRIVER__
+    -DKERNEL)

 
 

-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)

 
 add_library(audio time.c)
 add_dependencies(audio bugcodes)
 
 add_library(audio time.c)
 add_dependencies(audio bugcodes)

diff --git a/lib/drivers/sound/soundblaster/CMakeLists.txt b/lib/drivers/sound/soundblaster/CMakeLists.txt
index c70bc2d..4403a7e 100644 (file)
--- a/lib/drivers/sound/soundblaster/CMakeLists.txt
+++ b/lib/drivers/sound/soundblaster/CMakeLists.txt
@@ -1,11 +1,16 @@
 
 

-add_definitions(-D__NTDRIVER__)
-add_definitions(-DKERNEL)
+add_definitions(
+    -D__NTDRIVER__
+    -DKERNEL)

 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 

-file(GLOB_RECURSE SOURCE "*.c")
+file(APPEND SOURCE
+    dsp_io.c
+    version.c
+    speaker.c
+    rate.c
+    mixer.c)

 
 add_library(soundblaster ${SOURCE})
 add_dependencies(soundblaster bugcodes)
 
 add_library(soundblaster ${SOURCE})
 add_dependencies(soundblaster bugcodes)

-

diff --git a/lib/drivers/sound/uartmidi/CMakeLists.txt b/lib/drivers/sound/uartmidi/CMakeLists.txt
index 5977122..017e0af 100644 (file)
--- a/lib/drivers/sound/uartmidi/CMakeLists.txt
+++ b/lib/drivers/sound/uartmidi/CMakeLists.txt
@@ -1,9 +1,11 @@
 
 

-add_definitions(-D__NTDRIVER__)
-add_definitions(-DKERNEL)
+add_definitions(
+    -D__NTDRIVER__
+    -DKERNEL)

 
 

-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)

 
 add_library(uartmidi midiuart.c)
 add_dependencies(uartmidi bugcodes)
 
 add_library(uartmidi midiuart.c)
 add_dependencies(uartmidi bugcodes)