[Debburn-changes] r582 - in cdrkit/trunk: readom wodim

[Eduard Bloch]

Author: blade
Date: 2006-12-08 10:56:12 +0100 (Fri, 08 Dec 2006)
New Revision: 582

Removed:
   cdrkit/trunk/readom/cd_misc.c
   cdrkit/trunk/readom/defaults.c
   cdrkit/trunk/readom/getnum.c
   cdrkit/trunk/readom/misc.c
   cdrkit/trunk/readom/modes.c
   cdrkit/trunk/readom/movesect.c
   cdrkit/trunk/readom/movesect.h
   cdrkit/trunk/readom/scsi_cdr.c
   cdrkit/trunk/readom/scsi_mmc.c
   cdrkit/trunk/readom/scsi_scan.c
   cdrkit/trunk/readom/scsi_scan.h
Modified:
   cdrkit/trunk/readom/CMakeLists.txt
   cdrkit/trunk/wodim/CMakeLists.txt
Log:
Made wodim share its stuff trough wodimstuff, used by wodim and readom now

Modified: cdrkit/trunk/readom/CMakeLists.txt
===================================================================
--- cdrkit/trunk/readom/CMakeLists.txt	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/CMakeLists.txt	2006-12-08 09:56:12 UTC (rev 582)
@@ -5,12 +5,12 @@
 
 AUX_SOURCE_DIRECTORY(. readom_SRCS)
 
-LINK_DIRECTORIES(../librols ../libusal ../libdeflt)
+LINK_DIRECTORIES(../librols ../libusal ../libdeflt ../wodim)
 
 ADD_DEFINITIONS(-DCLONE_WRITE)
 
 ADD_EXECUTABLE (readom ${readom_SRCS})
-TARGET_LINK_LIBRARIES(readom ${EXTRA_LIBS} deflt)
+TARGET_LINK_LIBRARIES(readom ${EXTRA_LIBS} wodimstuff deflt)
 SET_TARGET_PROPERTIES(readom PROPERTIES  SKIP_BUILD_RPATH TRUE)
 
 INSTALL(TARGETS readom DESTINATION bin)

Deleted: cdrkit/trunk/readom/cd_misc.c
===================================================================
--- cdrkit/trunk/readom/cd_misc.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/cd_misc.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/cd_misc.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/defaults.c
===================================================================
--- cdrkit/trunk/readom/defaults.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/defaults.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/defaults.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/getnum.c
===================================================================
--- cdrkit/trunk/readom/getnum.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/getnum.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/getnum.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/misc.c
===================================================================
--- cdrkit/trunk/readom/misc.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/misc.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/misc.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/modes.c
===================================================================
--- cdrkit/trunk/readom/modes.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/modes.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/modes.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/movesect.c
===================================================================
--- cdrkit/trunk/readom/movesect.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/movesect.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/movesect.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/movesect.h
===================================================================
--- cdrkit/trunk/readom/movesect.h	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/movesect.h	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/movesect.h
\ No newline at end of file

Deleted: cdrkit/trunk/readom/scsi_cdr.c
===================================================================
--- cdrkit/trunk/readom/scsi_cdr.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/scsi_cdr.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/scsi_cdr.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/scsi_mmc.c
===================================================================
--- cdrkit/trunk/readom/scsi_mmc.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/scsi_mmc.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/scsi_mmc.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/scsi_scan.c
===================================================================
--- cdrkit/trunk/readom/scsi_scan.c	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/scsi_scan.c	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/scsi_scan.c
\ No newline at end of file

Deleted: cdrkit/trunk/readom/scsi_scan.h
===================================================================
--- cdrkit/trunk/readom/scsi_scan.h	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/readom/scsi_scan.h	2006-12-08 09:56:12 UTC (rev 582)
@@ -1 +0,0 @@
-link ../wodim/scsi_scan.h
\ No newline at end of file

Modified: cdrkit/trunk/wodim/CMakeLists.txt
===================================================================
--- cdrkit/trunk/wodim/CMakeLists.txt	2006-12-08 09:51:26 UTC (rev 581)
+++ cdrkit/trunk/wodim/CMakeLists.txt	2006-12-08 09:56:12 UTC (rev 582)
@@ -3,7 +3,9 @@
 INCLUDE(../include/AddScgBits.cmake)
 include(../include/AddSchilyBits.cmake)
 
-AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
+#AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
+SET(CDRECORD_SRCS wodim.c audiosize.c auinfo.c  cdr_drv.c cdtext.c clone.c crc16.c cue.c  diskid.c drv_7501.c drv_jvc.c drv_mmc.c drv_philips.c drv_simul.c drv_sony.c fifo.c  isosize.c scsi_cdr_mmc4.c scsi_mmc4.c sector.c subchan.c wm_packet.c wm_session.c wm_track.c xio.c)
+SET(CDRECORD_COMMON_SRCS cd_misc.c defaults.c getnum.c misc.c modes.c movesect.c scsi_cdr.c scsi_mmc.c scsi_scan.c)
 
 INCLUDE(CheckIncludeFiles)
 
@@ -22,6 +24,9 @@
 ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
 
 ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
+ADD_LIBRARY (wodimstuff SHARED ${CDRECORD_COMMON_SRCS})
+LIST(APPEND EXTRA_LIBS wodimstuff)
+
 TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
 SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)