[Debburn-changes] r518 - in cdrkit/branches/experimental: . genisoimage genisoimage/diag icedax readom wodim

Eduard Bloch blade at alioth.debian.org
Tue Nov 28 16:43:44 CET 2006 

Author: blade
Date: 2006-11-28 16:43:44 +0100 (Tue, 28 Nov 2006)
New Revision: 518

Removed:
   cdrkit/branches/experimental/genisoimage/cd_misc.c
   cdrkit/branches/experimental/genisoimage/defaults.c
   cdrkit/branches/experimental/genisoimage/diag/cd_misc.c
   cdrkit/branches/experimental/genisoimage/diag/defaults.c
   cdrkit/branches/experimental/genisoimage/diag/getnum.c
   cdrkit/branches/experimental/genisoimage/diag/modes.c
   cdrkit/branches/experimental/genisoimage/diag/scsi_cdr.c
   cdrkit/branches/experimental/genisoimage/getnum.c
   cdrkit/branches/experimental/genisoimage/modes.c
   cdrkit/branches/experimental/genisoimage/scsi_cdr.c
   cdrkit/branches/experimental/icedax/cd_misc.c
   cdrkit/branches/experimental/icedax/defaults.c
   cdrkit/branches/experimental/icedax/getnum.c
   cdrkit/branches/experimental/icedax/modes.c
   cdrkit/branches/experimental/icedax/scsi_cdr.c
   cdrkit/branches/experimental/icedax/scsi_scan.c
   cdrkit/branches/experimental/icedax/scsi_scan.h
   cdrkit/branches/experimental/readom/cd_misc.c
   cdrkit/branches/experimental/readom/defaults.c
   cdrkit/branches/experimental/readom/getnum.c
   cdrkit/branches/experimental/readom/misc.c
   cdrkit/branches/experimental/readom/modes.c
   cdrkit/branches/experimental/readom/movesect.c
   cdrkit/branches/experimental/readom/movesect.h
   cdrkit/branches/experimental/readom/scsi_cdr.c
   cdrkit/branches/experimental/readom/scsi_mmc.c
   cdrkit/branches/experimental/readom/scsi_scan.c
   cdrkit/branches/experimental/readom/scsi_scan.h
Modified:
   cdrkit/branches/experimental/CMakeLists.txt
   cdrkit/branches/experimental/genisoimage/CMakeLists.txt
   cdrkit/branches/experimental/icedax/CMakeLists.txt
   cdrkit/branches/experimental/readom/CMakeLists.txt
   cdrkit/branches/experimental/wodim/CMakeLists.txt
Log:
Experiment with temporary libwodimstuff.a

Modified: cdrkit/branches/experimental/CMakeLists.txt
===================================================================
--- cdrkit/branches/experimental/CMakeLists.txt	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/CMakeLists.txt	2006-11-28 15:43:44 UTC (rev 518)
@@ -1,3 +1,3 @@
 PROJECT (cdrkit)
-SUBDIRS(include genisoimage wodim libdeflt libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
+SUBDIRS(include icedax genisoimage wodim libdeflt libedc libhfs_iso libparanoia libusal librols libunls readom netscsid 3rd-party/dirsplit)
 

Modified: cdrkit/branches/experimental/genisoimage/CMakeLists.txt
===================================================================
--- cdrkit/branches/experimental/genisoimage/CMakeLists.txt	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/CMakeLists.txt	2006-11-28 15:43:44 UTC (rev 518)
@@ -25,18 +25,18 @@
 
 ADD_DEFINITIONS(-DUSE_LARGEFILES -DABORT_DEEP_ISO_ONLY -DAPPLE_HYB -DUDF -DDVD_VIDEO -DSORTING -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG -DJIGDO_TEMPLATE)
 
-SET(MKISOFS_MOST_SRCS apple.c boot.c cd_misc.c defaults.c desktop.c dvd_file.c dvd_reader.c eltorito.c exclude.c files.c fnmatch.c getnum.c getopt.c getopt1.c hash.c ifo_read.c joliet.c mac_label.c match.c modes.c multi.c name.c rock.c scsi.c scsi_cdr.c stream.c tree.c udf.c vms.c volume.c write.c boot-alpha.c boot-hppa.c boot-mips.c md5.c jte.c rsync.c
+SET(MKISOFS_MOST_SRCS apple.c boot.c   desktop.c dvd_file.c dvd_reader.c eltorito.c exclude.c files.c fnmatch.c  getopt.c getopt1.c hash.c ifo_read.c joliet.c mac_label.c match.c  multi.c name.c rock.c scsi.c  stream.c tree.c udf.c vms.c volume.c write.c boot-alpha.c boot-hppa.c boot-mips.c md5.c jte.c rsync.c
 	boot-mipsel.c endian.c  )
 
 #SET_SOURCE_FILES_PROPERTIES(${MKISOFS_MOST_SRCS} PROPERTIES )
-LINK_DIRECTORIES(../libhfs_iso ../librols ../libusal ../libunls ../libdeflt)
+LINK_DIRECTORIES(../libhfs_iso ../librols ../libusal ../libunls ../libdeflt ../wodim)
 
 ADD_EXECUTABLE (genisoimage genisoimage.c ${MKISOFS_MOST_SRCS})
-TARGET_LINK_LIBRARIES(genisoimage hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${EXTRA_LIBS})
+TARGET_LINK_LIBRARIES(genisoimage wodimstuff hfs_iso deflt ${MAGICLIBS} c unls z ${EXTRA_LIBICONV} ${EXTRA_LIBS})
 
 # common lib set and genisoimage source parts for the rest
-LINK_LIBRARIES(${EXTRA_LIBS} deflt unls ${EXTRA_LIBICONV} )
-SET(MI_COMMON scsi.c scsi_cdr.c cd_misc.c modes.c defaults.c getnum.c)
+LINK_LIBRARIES(wodimstuff ${EXTRA_LIBS} deflt unls ${EXTRA_LIBICONV} )
+SET(MI_COMMON scsi.c     )
 ADD_EXECUTABLE(devdump diag/dump.c  ${MI_COMMON})
 ADD_EXECUTABLE(isodebug	diag/isodebug.c   ${MI_COMMON})
 ADD_EXECUTABLE(isodump	diag/isodump.c    ${MI_COMMON})

Deleted: cdrkit/branches/experimental/genisoimage/cd_misc.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/cd_misc.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/cd_misc.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/cd_misc.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/defaults.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/defaults.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/defaults.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/defaults.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/diag/cd_misc.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/diag/cd_misc.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/diag/cd_misc.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../cd_misc.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/diag/defaults.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/diag/defaults.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/diag/defaults.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../defaults.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/diag/getnum.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/diag/getnum.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/diag/getnum.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../getnum.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/diag/modes.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/diag/modes.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/diag/modes.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../modes.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/diag/scsi_cdr.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/diag/scsi_cdr.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/diag/scsi_cdr.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../scsi_cdr.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/getnum.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/getnum.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/getnum.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/getnum.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/modes.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/modes.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/modes.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/modes.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/genisoimage/scsi_cdr.c
===================================================================
--- cdrkit/branches/experimental/genisoimage/scsi_cdr.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/genisoimage/scsi_cdr.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_cdr.c
\ No newline at end of file

Modified: cdrkit/branches/experimental/icedax/CMakeLists.txt
===================================================================
--- cdrkit/branches/experimental/icedax/CMakeLists.txt	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/CMakeLists.txt	2006-11-28 15:43:44 UTC (rev 518)
@@ -17,9 +17,9 @@
 	LIST(APPEND EXTRA_LIBS winmm)
 ENDIF (WIN32)
 
-LINK_DIRECTORIES(../librols ../libusal ../libdeflt ../libparanoia)
-ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c cd_misc.c icedax.c defaults.c getnum.c interface.c ioctl.c md5c.c modes.c raw.c resample.c ringbuff.c scsi_cdr.c scsi_cmds.c scsi_scan.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
-TARGET_LINK_LIBRARIES(icedax ${EXTRA_LIBS})
+LINK_DIRECTORIES(../librols ../libusal ../libdeflt ../libparanoia ../wodim)
+ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c  icedax.c   interface.c ioctl.c md5c.c  raw.c resample.c ringbuff.c  scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
+TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS})
 SET_TARGET_PROPERTIES(icedax PROPERTIES  SKIP_BUILD_RPATH TRUE)
 
 INSTALL(TARGETS icedax DESTINATION bin)

Deleted: cdrkit/branches/experimental/icedax/cd_misc.c
===================================================================
--- cdrkit/branches/experimental/icedax/cd_misc.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/cd_misc.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/cd_misc.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/icedax/defaults.c
===================================================================
--- cdrkit/branches/experimental/icedax/defaults.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/defaults.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/defaults.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/icedax/getnum.c
===================================================================
--- cdrkit/branches/experimental/icedax/getnum.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/getnum.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/getnum.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/icedax/modes.c
===================================================================
--- cdrkit/branches/experimental/icedax/modes.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/modes.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/modes.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/icedax/scsi_cdr.c
===================================================================
--- cdrkit/branches/experimental/icedax/scsi_cdr.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/scsi_cdr.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_cdr.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/icedax/scsi_scan.c
===================================================================
--- cdrkit/branches/experimental/icedax/scsi_scan.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/scsi_scan.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_scan.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/icedax/scsi_scan.h
===================================================================
--- cdrkit/branches/experimental/icedax/scsi_scan.h	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/icedax/scsi_scan.h	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_scan.h
\ No newline at end of file

Modified: cdrkit/branches/experimental/readom/CMakeLists.txt
===================================================================
--- cdrkit/branches/experimental/readom/CMakeLists.txt	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/CMakeLists.txt	2006-11-28 15:43:44 UTC (rev 518)
@@ -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/branches/experimental/readom/cd_misc.c
===================================================================
--- cdrkit/branches/experimental/readom/cd_misc.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/cd_misc.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/cd_misc.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/defaults.c
===================================================================
--- cdrkit/branches/experimental/readom/defaults.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/defaults.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/defaults.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/getnum.c
===================================================================
--- cdrkit/branches/experimental/readom/getnum.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/getnum.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/getnum.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/misc.c
===================================================================
--- cdrkit/branches/experimental/readom/misc.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/misc.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/misc.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/modes.c
===================================================================
--- cdrkit/branches/experimental/readom/modes.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/modes.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/modes.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/movesect.c
===================================================================
--- cdrkit/branches/experimental/readom/movesect.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/movesect.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/movesect.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/movesect.h
===================================================================
--- cdrkit/branches/experimental/readom/movesect.h	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/movesect.h	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/movesect.h
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/scsi_cdr.c
===================================================================
--- cdrkit/branches/experimental/readom/scsi_cdr.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/scsi_cdr.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_cdr.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/scsi_mmc.c
===================================================================
--- cdrkit/branches/experimental/readom/scsi_mmc.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/scsi_mmc.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_mmc.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/scsi_scan.c
===================================================================
--- cdrkit/branches/experimental/readom/scsi_scan.c	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/scsi_scan.c	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_scan.c
\ No newline at end of file

Deleted: cdrkit/branches/experimental/readom/scsi_scan.h
===================================================================
--- cdrkit/branches/experimental/readom/scsi_scan.h	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/readom/scsi_scan.h	2006-11-28 15:43:44 UTC (rev 518)
@@ -1 +0,0 @@
-link ../wodim/scsi_scan.h
\ No newline at end of file

Modified: cdrkit/branches/experimental/wodim/CMakeLists.txt
===================================================================
--- cdrkit/branches/experimental/wodim/CMakeLists.txt	2006-11-28 15:42:09 UTC (rev 517)
+++ cdrkit/branches/experimental/wodim/CMakeLists.txt	2006-11-28 15:43:44 UTC (rev 518)
@@ -3,7 +3,10 @@
 INCLUDE(../include/AddScgBits.cmake)
 include(../include/AddSchilyBits.cmake)
 
-AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
+#SET(CDRECORD_SRCS 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)
+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)
 
@@ -21,8 +24,11 @@
 
 ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
 
+ADD_LIBRARY (wodimstuff STATIC ${CDRECORD_COMMON_SRCS})
+
 ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
-TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
+
+TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc wodimstuff)
 SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)
 
 INSTALL(TARGETS wodim DESTINATION bin)

More information about the Debburn-changes mailing list