summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-13 01:20:14 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-13 01:20:14 +0000
commit4e3bf509883fba4840a813384b7768bc854d74a5 (patch)
tree20fe08d5700c5b5e6c5f36c464aea4ab41ee9489 /Makefile
parent742e7da887c6329c21b2ee6a66ae01b316803bbe (diff)
downloadmpv-4e3bf509883fba4840a813384b7768bc854d74a5.tar.bz2
mpv-4e3bf509883fba4840a813384b7768bc854d74a5.tar.xz
Clean up codec-cfg and friends handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19056 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index a4d6f2dd73..94510fa9d8 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,6 @@
include config.mak
-PRG_CFG = codec-cfg
-
LIBAV_INC =
ifeq ($(CONFIG_LIBAVUTIL),yes)
LIBAV_INC += -I./libavutil
@@ -412,18 +410,17 @@ $(PRG_MENCODER): $(MENCODER_DEP)
$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)
endif
-codecs.conf.h: $(PRG_CFG) etc/codecs.conf
- ./$(PRG_CFG) ./etc/codecs.conf > $@
+codec-cfg: codec-cfg.c codec-cfg.h help_mp.h
+ $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
+
+codecs.conf.h: codec-cfg etc/codecs.conf
+ ./codec-cfg ./etc/codecs.conf > $@
codec-cfg.o: codecs.conf.h
codecs2html: mp_msg.o
$(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@
-$(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h
- $(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \
- -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
-
install: $(ALL_PRG)
ifeq ($(VIDIX),yes)
$(MAKE) -C libdha install
@@ -490,10 +487,10 @@ endif
@echo "Uninstall completed"
clean:
- -rm -f *.o *.a *~ codecs.conf.h
+ -rm -f *.o *.a *~
distclean: clean doxygen_clean
- -rm -f *~ $(PRG) $(PRG_MENCODER) $(PRG_CFG)
+ -rm -f *~ $(PRG) $(PRG_MENCODER) codec-cfg codecs2html
-rm -f .depend configure.log codecs.conf.h help_mp.h
@for a in $(PARTS); do $(MAKE) -C $$a distclean; done