remove extra targets

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index d213200..e0bd23c 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -8,53 +8,15 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 compile: $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 
 compile: $(COMPILE_PACKAGES)
 install: base-files-install $(INSTALL_PACKAGES)
 

-$(COMPILE_PACKAGES): base-files-compile
-$(INSTALL_PACKAGES): base-files-install
-
-$(STAMP_DIR):
+$(STAMP_DIR) $(TARGET_DIR):

        mkdir -p $@
 
        mkdir -p $@
 

-$(TARGET_DIR):
-       mkdir -p $(TARGET_DIR)
-

 %-prepare: $(STAMP_DIR) $(TARGET_DIR)
 %-prepare: $(STAMP_DIR) $(TARGET_DIR)

-       @[ -f $(STAMP_DIR)/.$@ ] || { \
-               $(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
-               $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
-                       touch $(STAMP_DIR)/.$@; \
-                       $(CMD_TRACE) " done"; \
-                       $(END_TRACE); \
-               } \
-       }
-
-%-compile:
-       @[ -f $(STAMP_DIR)/.$@ ] || { \
-               $(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
-               $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
-                       touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
-                       touch $(STAMP_DIR)/.$@; \
-                       $(CMD_TRACE) " done"; \
-                       $(END_TRACE); \
-               } \
-       }
-
-%-install: %-compile
-       @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: "
-       @$(MAKE) -C $(patsubst %-install,%,$@) install
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
+       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare

 
 

-%-rebuild: 
-       @$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
-       @rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
-       $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
+%-compile: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-compile,%,$@) compile

 
 

-%-clean:
-       @$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
-       @$(CMD_TRACE) " done"
-       @$(END_TRACE)
+%-clean: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-clean,%,$@) clean