comparison Makefile @ 20981:22cb9d5f1e21

Rename libdvdread to dvdread. We really only include only the dvdread subdirectory of libdvdread. This will also allow getting rid of some local modifications.
author diego
date Sat, 18 Nov 2006 00:33:01 +0000
parents 4b51e6459e64
children 16fa2d135950
comparison
equal deleted inserted replaced
20980:70ca50bcc4a8 20981:22cb9d5f1e21
110 endif 110 endif
111 ifeq ($(VIDIX),yes) 111 ifeq ($(VIDIX),yes)
112 PARTS += libdha vidix 112 PARTS += libdha vidix
113 endif 113 endif
114 ifeq ($(DVDREAD_INTERNAL),yes) 114 ifeq ($(DVDREAD_INTERNAL),yes)
115 PARTS += libdvdread 115 PARTS += dvdread
116 PARTS += libdvdcss 116 PARTS += libdvdcss
117 endif 117 endif
118 ifeq ($(GUI),yes) 118 ifeq ($(GUI),yes)
119 PARTS += Gui 119 PARTS += Gui
120 endif 120 endif
166 endif 166 endif
167 ifeq ($(VIDIX),yes) 167 ifeq ($(VIDIX),yes)
168 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a 168 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
169 endif 169 endif
170 ifeq ($(DVDREAD_INTERNAL),yes) 170 ifeq ($(DVDREAD_INTERNAL),yes)
171 COMMON_DEPS += libdvdread/libdvdread.a 171 COMMON_DEPS += dvdread/libdvdread.a
172 COMMON_LIBS += libdvdread/libdvdread.a 172 COMMON_LIBS += dvdread/libdvdread.a
173 COMMON_DEPS += libdvdcss/libdvdcss.a 173 COMMON_DEPS += libdvdcss/libdvdcss.a
174 COMMON_LIBS += libdvdcss/libdvdcss.a 174 COMMON_LIBS += libdvdcss/libdvdcss.a
175 endif 175 endif
176 ifeq ($(CONFIG_ASS),yes) 176 ifeq ($(CONFIG_ASS),yes)
177 COMMON_DEPS += libass/libass.a 177 COMMON_DEPS += libass/libass.a
199 $(CC) -c $(CFLAGS) -o $@ $< 199 $(CC) -c $(CFLAGS) -o $@ $<
200 200
201 libaf/libaf.a: 201 libaf/libaf.a:
202 $(MAKE) -C libaf 202 $(MAKE) -C libaf
203 203
204 libdvdread/libdvdread.a: 204 dvdread/libdvdread.a:
205 $(MAKE) -C libdvdread 205 $(MAKE) -C dvdread
206 206
207 libdvdcss/libdvdcss.a: 207 libdvdcss/libdvdcss.a:
208 $(MAKE) -C libdvdcss 208 $(MAKE) -C libdvdcss
209 209
210 loader/libloader.a: 210 loader/libloader.a:
474 osdep/libosdep.a: .norecurse $(wildcard osdep/*.[ch]) 474 osdep/libosdep.a: .norecurse $(wildcard osdep/*.[ch])
475 input/libinput.a: .norecurse $(wildcard input/*.[ch]) 475 input/libinput.a: .norecurse $(wildcard input/*.[ch])
476 476
477 libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch]) 477 libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
478 libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch]) 478 libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
479 libdvdread/libdvdread.a: .norecurse $(wildcard libdvdread/*.[ch]) 479 dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])
480 libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch]) 480 libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
481 481
482 libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch]) 482 libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
483 stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch]) 483 stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
484 libmpcodecs/libmpcodecs.a: .norecurse $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch]) 484 libmpcodecs/libmpcodecs.a: .norecurse $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])