Commit 914444e5 authored by damienf's avatar damienf

- contribs: more fixes

parent d1f93aa1
......@@ -427,7 +427,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
.freetype: freetype2
ifdef HAVE_CYGWIN
(cd $<; CPPFLAGS="$(EXTRA_CPPFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" -I$(PREFIX)/include" ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
(cd $<; CPPFLAGS="$(EXTRA_CPPFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
endif
......@@ -712,7 +712,7 @@ ifneq ($(HOST),$(BUILD))
(patch -p0 < Patches/flac-cross.patch && cd $@ && autoconf)
endif
.flac: flac .ogg
.FLAC: flac .ogg
ifdef HAVE_WIN32
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install)
else
......@@ -729,7 +729,7 @@ endif
$(INSTALL_NAME)
touch $@
CLEAN_FILE += .flac
CLEAN_FILE += .FLAC
CLEAN_PKG += flac
DISTCLEAN_PKG += flac-$(FLAC_VERSION).tar.gz
......
diff -ruN live/Makefile.tail live.new/Makefile.tail
--- live/Makefile.tail 2007-01-17 21:44:27.000000000 +0100
+++ live.new/Makefile.tail 2007-02-20 08:45:20.000000000 +0100
@@ -17,10 +17,7 @@
@@ -17,10 +17,8 @@
ALL = $(LIVEMEDIA_LIB) \
$(GROUPSOCK_LIB) \
- $(USAGE_ENVIRONMENT_LIB) \
$(USAGE_ENVIRONMENT_LIB) \
- $(BASIC_USAGE_ENVIRONMENT_LIB) \
- $(TESTPROGS_APP) \
- $(MEDIA_SERVER_APP)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment