X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=af3162786aaaaaf6545a8929c9627dae1347107d;hb=fa81ade13492bab2a809e6c8990e211f04aecab8;hp=4e463ca17ab9440c83368ecbc41132219f0657ef;hpb=39c89debe2d9fcbd193f249a36ef1f4460592505;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4e463ca17a..af3162786a 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1286,24 +1286,6 @@ CLEAN_FILE += .live
 CLEAN_PKG += live
 DISTCLEAN_PKG += live555-$(LIVEDOTCOM_VERSION).tar.gz
 
-# ***************************************************************************
-# goom
-# ***************************************************************************
-
-#goom-macosx-altivec-bin.tar.gz:
-#	$(WGET) $(GOOM_URL)
-
-#goom: goom-macosx-altivec-bin.tar.gz
-#	$(EXTRACT_GZ)
-
-#.goom: goom
-#	(cd $<;)
-#	touch $@
-
-#CLEAN_FILE += .goom
-#CLEAN_PKG += goom
-#DISTCLEAN_PKG += goom-macosx-altivec-bin.tar.gz
-
 # ***************************************************************************
 # goom2k4
 # ***************************************************************************
@@ -1814,7 +1796,7 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
 #endif
 
 .raw1394: libraw1394
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PREFIX) install)
 #	sed 's/^typedef u_int8_t  byte_t;/\/* typedef u_int8_t  byte_t;\*\//'
 	touch $@
 	
@@ -1847,7 +1829,7 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
 .dc1394: libdc1394
 	(cd $<; ./configure --prefix=$(PREFIX) && \
 	 patch -p1 < ../Patches/libdc1394-noexamples.patch && \
-	 make && make DESTDIR=$(PRFIX) install)
+	 make && make DESTDIR=$(PREFIX) install)
 	touch $@
 	
 CLEAN_FILE += .dc1394
@@ -2389,7 +2371,7 @@ asa: asa.git.tar.gz
 
 .asa: asa .fontconfig .pcre .iconv
 	(cd $<; ./bootstrap; $(HOSTCC) CFLAGS="$(CFLAGS) -DPCRE_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX))
-	(cd $</lib/import; make || (echo "Please copy a ./prepare file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
+	(cd $</lib/import; make || (echo "Please copy a ./preparse file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
 	(cd $<; make && make install)
 	$(INSTALL_NAME)
 	touch $@
@@ -2428,7 +2410,7 @@ liboil: liboil-$(OIL_VERSION).tar.gz
 	patch -d liboil -p1 < Patches/liboil-noshared.patch
 
 .liboil: liboil
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install)
 	touch $@
 
 CLEAN_FILE += .liboil