1.1 --- a/configure.in Sat Aug 18 21:58:26 2001 +0000
1.2 +++ b/configure.in Sat Aug 18 22:03:11 2001 +0000
1.3 @@ -1237,7 +1237,8 @@
1.4 fi
1.5 # Set up files for the cdrom library
1.6 if test x$enable_cdrom = xyes; then
1.7 - COPY_ARCH_SRC(src/cdrom, linux, SDL_syscdrom.c)
1.8 + CDROM_SUBDIRS="$CDROM_SUBDIRS linux"
1.9 + CDROM_DRIVERS="$CDROM_DRIVERS linux/libcdrom_linux.la"
1.10 fi
1.11 # Set up files for the thread library
1.12 if test x$enable_threads = xyes; then
1.13 @@ -1302,7 +1303,8 @@
1.14 # Set up files for the cdrom library
1.15 # (No cdrom support yet)
1.16 if test x$enable_cdrom = xyes; then
1.17 - COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
1.18 + CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
1.19 + CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
1.20 fi
1.21 # Set up files for the thread library
1.22 if test x$enable_threads = xyes; then
1.23 @@ -1353,7 +1355,8 @@
1.24 fi
1.25 # Set up files for the cdrom library
1.26 if test x$enable_cdrom = xyes; then
1.27 - COPY_ARCH_SRC(src/cdrom, freebsd, SDL_syscdrom.c)
1.28 + CDROM_SUBDIRS="$CDROM_SUBDIRS freebsd"
1.29 + CDROM_DRIVERS="$CDROM_DRIVERS freebsd/libcdrom_freebsd.la"
1.30 fi
1.31 # Set up files for the thread library
1.32 if test x$enable_threads = xyes; then
1.33 @@ -1404,7 +1407,8 @@
1.34 fi
1.35 # Set up files for the cdrom library
1.36 if test x$enable_cdrom = xyes; then
1.37 - COPY_ARCH_SRC(src/cdrom, openbsd, SDL_syscdrom.c)
1.38 + CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd"
1.39 + CDROM_DRIVERS="$CDROM_DRIVERS openbsd/libcdrom_openbsd.la"
1.40 fi
1.41 # Set up files for the thread library
1.42 if test x$enable_threads = xyes; then
1.43 @@ -1463,7 +1467,8 @@
1.44 fi
1.45 # Set up files for the cdrom library
1.46 if test x$enable_cdrom = xyes; then
1.47 - COPY_ARCH_SRC(src/cdrom, openbsd, SDL_syscdrom.c)
1.48 + CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd"
1.49 + CDROM_DRIVERS="$CDROM_DRIVERS openbsd/libcdrom_openbsd.la"
1.50 fi
1.51 # Set up files for the thread library
1.52 if test x$enable_threads = xyes; then
1.53 @@ -1517,7 +1522,8 @@
1.54 fi
1.55 # Set up files for the cdrom library
1.56 if test x$enable_cdrom = xyes; then
1.57 - COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
1.58 + CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
1.59 + CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
1.60 fi
1.61 # Set up files for the thread library
1.62 if test x$enable_threads = xyes; then
1.63 @@ -1566,7 +1572,8 @@
1.64 fi
1.65 # Set up files for the cdrom library
1.66 if test x$enable_cdrom = xyes; then
1.67 - COPY_ARCH_SRC(src/cdrom, linux, SDL_syscdrom.c)
1.68 + CDROM_SUBDIRS="$CDROM_SUBDIRS linux"
1.69 + CDROM_DRIVERS="$CDROM_DRIVERS linux/libcdrom_linux.la"
1.70 fi
1.71 # Set up files for the thread library
1.72 if test x$enable_threads = xyes; then
1.73 @@ -1612,7 +1619,8 @@
1.74 # Set up files for the cdrom library
1.75 # (No CD-ROM support yet)
1.76 if test x$enable_cdrom = xyes; then
1.77 - COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
1.78 + CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
1.79 + CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
1.80 fi
1.81 # Set up files for the thread library
1.82 if test x$enable_threads = xyes; then
1.83 @@ -1673,7 +1681,8 @@
1.84 # Set up files for the cdrom library
1.85 # (No CD-ROM support yet)
1.86 if test x$enable_cdrom = xyes; then
1.87 - COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
1.88 + CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
1.89 + CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
1.90 fi
1.91 # Set up files for the thread library
1.92 if test x$enable_threads = xyes; then
1.93 @@ -1717,7 +1726,8 @@
1.94 fi
1.95 # Set up files for the cdrom library
1.96 if test x$enable_cdrom = xyes; then
1.97 - COPY_ARCH_SRC(src/cdrom, aix, SDL_syscdrom.c)
1.98 + CDROM_SUBDIRS="$CDROM_SUBDIRS aix"
1.99 + CDROM_DRIVERS="$CDROM_DRIVERS aix/libcdrom_aix.la"
1.100 fi
1.101 # Set up files for the thread library
1.102 if test x$enable_threads = xyes; then
1.103 @@ -1762,7 +1772,8 @@
1.104 # Set up files for the cdrom library
1.105 # (No cdrom support yet)
1.106 if test x$enable_cdrom = xyes; then
1.107 - COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
1.108 + CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
1.109 + CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
1.110 fi
1.111 # Set up files for the thread library
1.112 if test x$enable_threads = xyes; then
1.113 @@ -1806,7 +1817,8 @@
1.114 fi
1.115 # Set up files for the cdrom library
1.116 if test x$enable_cdrom = xyes; then
1.117 - COPY_ARCH_SRC(src/cdrom, qnx, SDL_syscdrom.c)
1.118 + CDROM_SUBDIRS="$CDROM_SUBDIRS qnx"
1.119 + CDROM_DRIVERS="$CDROM_DRIVERS qnx/libcdrom_qnx.la"
1.120 fi
1.121 # Set up files for the thread library
1.122 if test x$enable_threads = xyes; then
1.123 @@ -1858,7 +1870,8 @@
1.124 fi
1.125 # Set up files for the cdrom library
1.126 if test x$enable_cdrom = xyes; then
1.127 - COPY_ARCH_SRC(src/cdrom, win32, SDL_syscdrom.c)
1.128 + CDROM_SUBDIRS="$CDROM_SUBDIRS win32"
1.129 + CDROM_DRIVERS="$CDROM_DRIVERS win32/libcdrom_win32.la"
1.130 fi
1.131 # Set up files for the thread library
1.132 if test x$enable_threads = xyes; then
1.133 @@ -1913,7 +1926,8 @@
1.134 fi
1.135 # Set up files for the cdrom library
1.136 if test x$enable_cdrom = xyes; then
1.137 - COPY_ARCH_SRC(src/cdrom, beos, SDL_syscdrom.c)
1.138 + CDROM_SUBDIRS="$CDROM_SUBDIRS beos"
1.139 + CDROM_DRIVERS="$CDROM_DRIVERS beos/libcdrom_beos.la"
1.140 fi
1.141 # Set up files for the thread library
1.142 if test x$enable_threads = xyes; then
1.143 @@ -1956,7 +1970,8 @@
1.144 fi
1.145 # Set up files for the cdrom library
1.146 if test x$enable_cdrom = xyes; then
1.147 - COPY_ARCH_SRC(src/cdrom, macos, SDL_syscdrom.c)
1.148 + CDROM_SUBDIRS="$CDROM_SUBDIRS macos"
1.149 + CDROM_DRIVERS="$CDROM_DRIVERS macos/libcdrom_macos.la"
1.150 fi
1.151 # Set up files for the thread library
1.152 if test x$enable_threads = xyes; then
1.153 @@ -2002,7 +2017,8 @@
1.154 fi
1.155 # Set up files for the cdrom library
1.156 if test x$enable_cdrom = xyes; then
1.157 - COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
1.158 + CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
1.159 + CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
1.160 fi
1.161 # Set up files for the thread library
1.162 if test x$enable_threads = xyes; then
1.163 @@ -2077,6 +2093,8 @@
1.164 AC_SUBST(VIDEO_DRIVERS)
1.165 AC_SUBST(JOYSTICK_SUBDIRS)
1.166 AC_SUBST(JOYSTICK_DRIVERS)
1.167 +AC_SUBST(CDROM_SUBDIRS)
1.168 +AC_SUBST(CDROM_DRIVERS)
1.169 AC_SUBST(SDL_EXTRADIRS)
1.170 AC_SUBST(SDL_EXTRALIBS)
1.171 AC_SUBST(SYSTEM_LIBS)
1.172 @@ -2164,6 +2182,15 @@
1.173 src/joystick/macos/Makefile
1.174 src/joystick/win32/Makefile
1.175 src/cdrom/Makefile
1.176 +src/cdrom/aix/Makefile
1.177 +src/cdrom/beos/Makefile
1.178 +src/cdrom/dummy/Makefile
1.179 +src/cdrom/freebsd/Makefile
1.180 +src/cdrom/linux/Makefile
1.181 +src/cdrom/macos/Makefile
1.182 +src/cdrom/openbsd/Makefile
1.183 +src/cdrom/qnx/Makefile
1.184 +src/cdrom/win32/Makefile
1.185 src/thread/Makefile
1.186 src/timer/Makefile
1.187 src/endian/Makefile