diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /mplayer/mplayer-1.0pre3try2/Makefile.patch | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'mplayer/mplayer-1.0pre3try2/Makefile.patch')
| -rw-r--r-- | mplayer/mplayer-1.0pre3try2/Makefile.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/mplayer/mplayer-1.0pre3try2/Makefile.patch b/mplayer/mplayer-1.0pre3try2/Makefile.patch deleted file mode 100644 index 6cd49bb1c8..0000000000 --- a/mplayer/mplayer-1.0pre3try2/Makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./Makefile~Makefile.patch 2004-09-24 20:07:12.000000000 +0930 -+++ ./Makefile 2004-09-24 20:09:38.000000000 +0930 -@@ -10,10 +10,6 @@ - PRG_CFG = codec-cfg - PRG_MENCODER = mencoder - --# Do not strip the binaries at installation --ifeq ($(STRIPBINARIES),yes) --INSTALLSTRIP = -s --endif - - # These subdirectories require installation due to binaries within them. - ifeq ($(VIDIX),yes) -@@ -212,7 +208,8 @@ - - $(PRG): $(MPLAYER_DEP) - ./darwinfixlib.sh $(MPLAYER_DEP) -- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm -+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm -ljpeg -lpng -lts -+ - - mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a - winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ -@@ -246,7 +243,7 @@ - $(MENCODER_DEP): version.h - - $(PRG_CFG): version.h codec-cfg.c codec-cfg.h -- $(CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) -+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) - - install: $(ALL_PRG) - ifeq ($(VIDIX),yes) -@@ -316,7 +313,7 @@ - -$(MAKE) -C libavcodec distclean LIBPREF=lib LIBSUF=.a - - strip: -- strip -s $(ALL_PRG) -+ - - dep: depend - |