[matroska] r1028 - trunk/DvdMenuXtractor

Author: robux4
Date: 2005-01-10 18:56:25 +0300 (Mon, 10 Jan 2005)
New Revision: 1028

Modified:
   trunk/DvdMenuXtractor/Makefile
Log:
DMX: cleaner Unix makefile

Modified: trunk/DvdMenuXtractor/Makefile
===================================================================
--- trunk/DvdMenuXtractor/Makefile	2005-01-10 15:30:42 UTC (rev 1027)
+++ trunk/DvdMenuXtractor/Makefile	2005-01-10 15:56:25 UTC (rev 1028)
@@ -15,7 +15,7 @@
 CFLAGS = $(shell wx-config --cflags)
 CXXFLAGS = $(shell wx-config --cxxflags)
 CPPFLAGS = $(shell wx-config --cppflags)
-LDFLAGS = $(shell wx-config --ldflags) ./mpeg2dec/libvo/libvo.a
+LDFLAGS = $(shell wx-config --ldflags) libdvdread.a
 
 ### Variables: ###
 
@@ -25,7 +25,6 @@
 DVDMENUXTRACTOR_CXXFLAGS = $(__WX_FLAGS_p) \
 	-I./ $(CPPFLAGS) $(CXXFLAGS)
 DVDMENUXTRACTOR_OBJECTS =  \
-	$(__DvdMenuXtractor___win32rc) \
 	build/DvdMenuXtractor_DvdMenuXtractor.o \
 	build/DvdMenuXtractor_IFOFile.o \
 	build/DvdMenuXtractor_MyWizard.o \
@@ -33,8 +32,6 @@
 	build/DvdMenuXtractor_VobParser.o \
 	build/DvdMenuXtractor_base64.o \
 	build/DvdMenuXtractor_spudec.o \
-	build/DvdMenuXtractor_dvd_reader.o \
-	build/DvdMenuXtractor_ifo_read.o \
 	build/DvdMenuXtractor_iso_lang.o
 
 ### Conditionally set variables: ###
@@ -62,15 +59,12 @@
 distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-build/DvdMenuXtractor$(EXEEXT): $(DVDMENUXTRACTOR_OBJECTS) $(__DvdMenuXtractor___win32rc)
+build/DvdMenuXtractor$(EXEEXT): $(DVDMENUXTRACTOR_OBJECTS) $(libdvdread)
 	$(CXX) -o $@ $(DVDMENUXTRACTOR_OBJECTS) $(LDFLAGS)  $(LDFLAGS_GUI)
 	
 	$(__DvdMenuXtractor___mac_setfilecmd)
 	$(__DvdMenuXtractor___os2_emxbindcmd)
 
-build/DvdMenuXtractor_DvdMenuXtractor_rc.o: $(srcdir)/DvdMenuXtractor.rc
-	$(RESCOMP) -i$< -o$@ --include-dir F:\tmp\wxWindows-2.5.1\include
-
 build/DvdMenuXtractor_DvdMenuXtractor.o: $(srcdir)/DvdMenuXtractor.cpp
 	$(CXXC) -c -o $@ $(DVDMENUXTRACTOR_CXXFLAGS) $<
 
@@ -92,14 +86,7 @@
 build/DvdMenuXtractor_spudec.o: $(srcdir)/spudec/spudec.c
 	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CFLAGS) $<
 
-build/DvdMenuXtractor_dvd_reader.o: $(srcdir)/dvdread_win32/dvd_reader.c
+build/DvdMenuXtractor_iso_lang.o: $(srcdir)/iso/iso_lang.c
 	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CFLAGS) $<
 
-build/DvdMenuXtractor_ifo_read.o: $(srcdir)/dvdread_win32/ifo_read.c
-	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CFLAGS) $<
-
-build/DvdMenuXtractor_iso_lang.o: $(srcdir)/dvdread_win32/iso_lang.c
-	$(CCC) -c -o $@ $(DVDMENUXTRACTOR_CFLAGS) $<
-
-
 .PHONY: all install uninstall clean distclean