[Debburn-changes] r583 - in cdrkit/trunk: genisoimage icedax wodim
Eduard Bloch
blade at alioth.debian.org
Fri Dec 8 11:07:31 CET 2006
Author: blade
Date: 2006-12-08 11:07:31 +0100 (Fri, 08 Dec 2006)
New Revision: 583
Removed:
cdrkit/trunk/genisoimage/cd_misc.c
cdrkit/trunk/genisoimage/defaults.c
cdrkit/trunk/genisoimage/getnum.c
cdrkit/trunk/genisoimage/modes.c
cdrkit/trunk/genisoimage/scsi_cdr.c
cdrkit/trunk/icedax/cd_misc.c
cdrkit/trunk/icedax/defaults.c
cdrkit/trunk/icedax/getnum.c
cdrkit/trunk/icedax/modes.c
cdrkit/trunk/icedax/scsi_cdr.c
cdrkit/trunk/icedax/scsi_scan.c
cdrkit/trunk/icedax/scsi_scan.h
Modified:
cdrkit/trunk/genisoimage/CMakeLists.txt
cdrkit/trunk/icedax/CMakeLists.txt
cdrkit/trunk/wodim/CMakeLists.txt
Log:
Made other apps used shared wodim's stuff
Modified: cdrkit/trunk/genisoimage/CMakeLists.txt
===================================================================
--- cdrkit/trunk/genisoimage/CMakeLists.txt 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/genisoimage/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
@@ -25,7 +25,7 @@
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 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 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 )
INCLUDE(CheckFunctionExists)
@@ -37,19 +37,18 @@
#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)
-ADD_EXECUTABLE(devdump diag/dump.c ${MI_COMMON})
-ADD_EXECUTABLE(isodebug diag/isodebug.c ${MI_COMMON})
-ADD_EXECUTABLE(isodump diag/isodump.c ${MI_COMMON})
-ADD_EXECUTABLE(isoinfo diag/isoinfo.c ${MI_COMMON})
-ADD_EXECUTABLE(isovfy diag/isovfy.c ${MI_COMMON})
+LINK_LIBRARIES(wodimstuff ${EXTRA_LIBS} deflt unls ${EXTRA_LIBICONV} )
+ADD_EXECUTABLE(devdump diag/dump.c scsi.c)
+ADD_EXECUTABLE(isodebug diag/isodebug.c scsi.c)
+ADD_EXECUTABLE(isodump diag/isodump.c scsi.c)
+ADD_EXECUTABLE(isoinfo diag/isoinfo.c scsi.c)
+ADD_EXECUTABLE(isovfy diag/isovfy.c scsi.c)
SET_TARGET_PROPERTIES(genisoimage devdump isodebug isodump isoinfo isovfy PROPERTIES SKIP_BUILD_RPATH TRUE)
Deleted: cdrkit/trunk/genisoimage/cd_misc.c
===================================================================
--- cdrkit/trunk/genisoimage/cd_misc.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/genisoimage/cd_misc.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/cd_misc.c
\ No newline at end of file
Deleted: cdrkit/trunk/genisoimage/defaults.c
===================================================================
--- cdrkit/trunk/genisoimage/defaults.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/genisoimage/defaults.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/defaults.c
\ No newline at end of file
Deleted: cdrkit/trunk/genisoimage/getnum.c
===================================================================
--- cdrkit/trunk/genisoimage/getnum.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/genisoimage/getnum.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/getnum.c
\ No newline at end of file
Deleted: cdrkit/trunk/genisoimage/modes.c
===================================================================
--- cdrkit/trunk/genisoimage/modes.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/genisoimage/modes.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/modes.c
\ No newline at end of file
Deleted: cdrkit/trunk/genisoimage/scsi_cdr.c
===================================================================
--- cdrkit/trunk/genisoimage/scsi_cdr.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/genisoimage/scsi_cdr.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/scsi_cdr.c
\ No newline at end of file
Modified: cdrkit/trunk/icedax/CMakeLists.txt
===================================================================
--- cdrkit/trunk/icedax/CMakeLists.txt 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
@@ -19,8 +19,8 @@
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})
+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/trunk/icedax/cd_misc.c
===================================================================
--- cdrkit/trunk/icedax/cd_misc.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/cd_misc.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/cd_misc.c
\ No newline at end of file
Deleted: cdrkit/trunk/icedax/defaults.c
===================================================================
--- cdrkit/trunk/icedax/defaults.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/defaults.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/defaults.c
\ No newline at end of file
Deleted: cdrkit/trunk/icedax/getnum.c
===================================================================
--- cdrkit/trunk/icedax/getnum.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/getnum.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/getnum.c
\ No newline at end of file
Deleted: cdrkit/trunk/icedax/modes.c
===================================================================
--- cdrkit/trunk/icedax/modes.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/modes.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/modes.c
\ No newline at end of file
Deleted: cdrkit/trunk/icedax/scsi_cdr.c
===================================================================
--- cdrkit/trunk/icedax/scsi_cdr.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/scsi_cdr.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/scsi_cdr.c
\ No newline at end of file
Deleted: cdrkit/trunk/icedax/scsi_scan.c
===================================================================
--- cdrkit/trunk/icedax/scsi_scan.c 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/scsi_scan.c 2006-12-08 10:07:31 UTC (rev 583)
@@ -1 +0,0 @@
-link ../wodim/scsi_scan.c
\ No newline at end of file
Deleted: cdrkit/trunk/icedax/scsi_scan.h
===================================================================
--- cdrkit/trunk/icedax/scsi_scan.h 2006-12-08 09:56:12 UTC (rev 582)
+++ cdrkit/trunk/icedax/scsi_scan.h 2006-12-08 10:07:31 UTC (rev 583)
@@ -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:56:12 UTC (rev 582)
+++ cdrkit/trunk/wodim/CMakeLists.txt 2006-12-08 10:07:31 UTC (rev 583)
@@ -24,7 +24,7 @@
ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE)
ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
-ADD_LIBRARY (wodimstuff SHARED ${CDRECORD_COMMON_SRCS})
+ADD_LIBRARY (wodimstuff STATIC ${CDRECORD_COMMON_SRCS})
LIST(APPEND EXTRA_LIBS wodimstuff)
TARGET_LINK_LIBRARIES(wodim ${EXTRA_LIBS} deflt edc)
More information about the Debburn-changes
mailing list