Changeset 50d34d3 in freewrt

Timestamp:

Jul 21, 2006, 2:02:55 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

a9b77aa

Parents:

d419478

Message:

remove redundant code, and these mostlyclean/rebuild stuff
(the latter discussed with wbx@ last weekend)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@304 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/rules.mk (modified) (3 diffs)

package/rules.mk

@@ -25 +25 @@
 $$(IDIR_$(1))/CONTROL/control: $(WRKBUILD)/.prepared
         $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4)
-        if [ "$$(IDEPEND_$(1))" != "" ]; then echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; fi
+        [ -n "$$(IDEPEND_$(1))" ] && echo "Depends: $$(IDEPEND_$(1))" >>$$(IDIR_$(1))/CONTROL/control
         for file in conffiles preinst postinst prerm postrm; do \
                 [ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
@@ -50 +50 @@
 $(WRKBUILD)/.prepared: ${DISTFILES}
         rm -rf $(WRKBUILD)
-        mkdir -p ${WRKDIR}
         ${EXTRACT_CMD}
-        if [ -d ./patches ]; then \
-                $(PATCH) $(WRKBUILD) ./patches ; \
-        fi
+        [ ! -d ./patches ] || $(PATCH) $(WRKBUILD) ./patches
         touch $(WRKBUILD)/.prepared
 endif
@@ -83 +80 @@
         @$(MAKE) install-targets $(MAKE_TRACE)
 
-mostlyclean:
-rebuild:
-        $(CMD_TRACE) "rebuilding... "
-        @-$(MAKE) mostlyclean 2>&1 >/dev/null
-        if [ -f $(WRKBUILD)/.built ]; then \
-                $(MAKE) clean $(MAKE_TRACE); \
-        fi
-        $(MAKE) compile $(MAKE_TRACE)
-
 $(WRKBUILD)/.configured:
 $(WRKBUILD)/.built: