Changeset 1202


Ignore:
Timestamp:
Dec 14, 2006, 3:17:23 AM (15 years ago)
Author:
titer
Message:

Makes make happy with -j

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r620 r1202  
    2222-include mk/config.mk
    2323ifneq ($(SYSTEM),Darwin)
    24 REALMAKE = $(MAKE) -f mk/default.mk
     24MAKEARGS += -f mk/default.mk
    2525else
    26 REALMAKE = $(MAKE) -f mk/osx.mk
     26MAKEARGS += -f mk/osx.mk
    2727endif
    2828
    2929all: required
    30         @$(REALMAKE) all
     30        @$(MAKE) $(MAKEARGS) all
    3131clean: required
    32         @$(REALMAKE) clean
    33 install: required
    34         @$(REALMAKE) install
    35 package: required
    36         @$(REALMAKE) package
    37 package-release: required
    38         @$(REALMAKE) package-release
     32        @$(MAKE) $(MAKEARGS) clean
     33install: all
     34        @$(MAKE) $(MAKEARGS) install
     35package: all
     36        @$(MAKE) $(MAKEARGS) package
     37package-release: all
     38        @$(MAKE) $(MAKEARGS) package-release
  • trunk/mk/common.mk

    r1142 r1202  
    8080endef
    8181
    82 RM    = rm -Rf
    83 CP    = cp -f
    84 MKDIR = mkdir -p
    85 MAKE += --no-print-directory
     82RM       = rm -Rf
     83CP       = cp -f
     84MKDIR    = mkdir -p
     85MAKEARGS = --no-print-directory
  • trunk/mk/default.mk

    r1098 r1202  
    1616.lib:
    1717        @echo "* Building libtransmission"
    18         @$(MAKE) -C libtransmission -f ../mk/lib.mk
     18        @$(MAKE) $(MAKEARGS) -C libtransmission -f ../mk/lib.mk
    1919
    2020.cli: .lib
    2121        @echo "* Building Transmission CLI client"
    22         @$(MAKE) -C cli -f ../mk/cli.mk
     22        @$(MAKE) $(MAKEARGS) -C cli -f ../mk/cli.mk
    2323
    2424.gtk: .lib
    2525        @echo "* Building Transmission GTK+ client"
    26         @$(MAKE) -C gtk -f ../mk/gtk.mk
     26        @$(MAKE) $(MAKEARGS) -C gtk -f ../mk/gtk.mk
    2727
    2828.beos: .lib
    2929        @echo "* Building Transmission BeOS client"
    30         @make -C beos -f ../mk/beos.mk
     30        @$(MAKE) $(MAKEARGS) -C beos -f ../mk/beos.mk
    3131
    3232install: all $(foreach SUB,$(TARGETS),.install$(SUB)) .install.misc
     
    3434.install.cli: .cli
    3535        @echo "* Installing Transmission CLI client"
    36         @$(MAKE) -C cli -f ../mk/cli.mk install
     36        @$(MAKE) $(MAKEARGS) -C cli -f ../mk/cli.mk install
    3737
    3838.install.gtk: .gtk
    3939        @echo "* Installing Transmission GTK+ client"
    40         @$(MAKE) -C gtk -f ../mk/gtk.mk install
     40        @$(MAKE) $(MAKEARGS) -C gtk -f ../mk/gtk.mk install
    4141
    4242.install.beos:
     
    4848
    4949clean:
    50         @$(MAKE) -C libtransmission -f ../mk/lib.mk clean
    51         @$(MAKE) -C cli -f ../mk/cli.mk clean
     50        @$(MAKE) $(MAKEARGS) -C libtransmission -f ../mk/lib.mk clean
     51        @$(MAKE) $(MAKEARGS) -C cli -f ../mk/cli.mk clean
    5252ifeq ($(GTK),yes)
    53         @$(MAKE) -C gtk -f ../mk/gtk.mk clean
     53        @$(MAKE) $(MAKEARGS) -C gtk -f ../mk/gtk.mk clean
    5454endif
    5555ifeq ($(SYSTEM),BeOS)
    56         @$(MAKE) -C beos -f ../mk/beos.mk clean
     56        @$(MAKE) $(MAKEARGS) -C beos -f ../mk/beos.mk clean
    5757endif
  • trunk/mk/gtk.mk

    r947 r1202  
    1919
    2020.po:
    21         @$(MAKE) -C po -f ../../mk/po.mk
     21        @$(MAKE) $(MAKEARGS) -C po -f ../../mk/po.mk
    2222
    2323%.o: %.c ../mk/config.mk ../mk/common.mk ../mk/gtk.mk
     
    2929        @echo "Clean $(OBJS)"
    3030        @$(RM) $(OBJS)
    31         @$(MAKE) -C po -f ../../mk/po.mk clean
     31        @$(MAKE) $(MAKEARGS) -C po -f ../../mk/po.mk clean
    3232
    3333.depend: $(SRCS) ../mk/config.mk ../mk/common.mk ../mk/gtk.mk
     
    3636install: transmission-gtk .po
    3737        $(INSTALL_BIN_RULE)
    38         @$(MAKE) -C po -f ../../mk/po.mk install
     38        @$(MAKE) $(MAKEARGS) -C po -f ../../mk/po.mk install
    3939
    4040morepot: $(SRCS)
Note: See TracChangeset for help on using the changeset viewer.