Mercurial > mplayer.hg
changeset 17958:ac071d4aafd2
Don't call make from shell constructs it prevent proper
build paralelization.
| author | albeu |
|---|---|
| date | Sun, 26 Mar 2006 10:52:13 +0000 |
| parents | adffed192053 |
| children | f4aa4dc211c2 |
| files | Makefile vidix/Makefile |
| diffstat | 2 files changed, 13 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Mar 26 10:43:56 2006 +0000 +++ b/Makefile Sun Mar 26 10:52:13 2006 +0000 @@ -21,12 +21,6 @@ INSTALLSTRIP = -s endif -# These subdirectories require installation due to binaries within them. -ifeq ($(VIDIX),yes) -SUBDIRS += libdha vidix -DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done -endif - SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ @@ -466,7 +460,8 @@ install: $(ALL_PRG) ifeq ($(VIDIX),yes) - $(DO_MAKE) + $(MAKE) -C libdha install + $(MAKE) -C vidix install endif if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) @@ -535,7 +530,8 @@ fi ; \ done ifeq ($(VIDIX),yes) - $(DO_MAKE) + $(MAKE) -C libdha uninstall + $(MAKE) -C vidix uninstall endif @echo "Uninstall completed"
--- a/vidix/Makefile Sun Mar 26 10:43:56 2006 +0000 +++ b/vidix/Makefile Sun Mar 26 10:52:13 2006 +0000 @@ -1,6 +1,4 @@ LIBNAME = libvidix.a -SUBDIRS = drivers -DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done include ../config.mak @@ -16,8 +14,10 @@ .c.o: $(CC) -c $(CFLAGS) -o $@ $< -all: $(SUBDIRS) $(LIBNAME) - $(DO_MAKE) +all: $(SUBDIRS) $(LIBNAME) do_drivers + +do_drivers: + $(MAKE) -C drivers $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) @@ -25,23 +25,23 @@ clean: rm -f *.o *.a *~ - $(DO_MAKE) + $(MAKE) -C drivers clean distclean: clean rm -f .depend test - $(DO_MAKE) + $(MAKE) -C drivers distclean dep: depend - $(DO_MAKE) + $(MAKE) -C drivers dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend install: - $(DO_MAKE) + $(MAKE) -C drivers install uninstall: - $(DO_MAKE) + $(MAKE) -C drivers uninstall # # include dependency files if they exist