diff options
| author | Thorsten Glaser <tg@mirbsd.org> | 2009-12-20 15:29:27 +0059 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 17:37:02 +0100 |
| commit | 89192ea453b664cabb05b0a3037269bf02c3fae2 (patch) | |
| tree | 95bf00e7d36e5cd15dd440f378fb251eb7d857f7 | |
| parent | d47031878a2221b24e7c9c823ab663996082f890 (diff) | |
introduce pkgmaker into the build at (I hope) all right places
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
| -rw-r--r-- | mk/build.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mk/build.mk b/mk/build.mk index f70d40cb1..781da5f41 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -227,7 +227,7 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -defconfig: +defconfig: _menu ifeq (${OStype},Linux) @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig endif @@ -318,21 +318,21 @@ ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config endif -menuconfig: $(CONFIG)/mconf defconfig +menuconfig: $(CONFIG)/mconf defconfig _menu @if [ ! -f .config ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ fi @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -_config: $(CONFIG)/conf +_config: $(CONFIG)/conf _menu -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null ${POSTCONFIG} .NOTPARALLEL: _mconfig _mconfig: ${CONFIG}/conf _mconfig2 _config -_mconfig2: ${CONFIG}/conf modconfig +_mconfig2: ${CONFIG}/conf modconfig _menu @${CONFIG}/conf -m ${RCONFIG} >/dev/null # build all targets and combinations @@ -342,7 +342,7 @@ bulk: $(MAKE) v $(CP) $(BIN_DIR) $(TOPDIR)/bulk $(MAKE) cleantarget - + distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \ @@ -353,6 +353,5 @@ distclean: endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -menu: +_menu: .PHONY mksh $(TOPDIR)/package/pkgmaker - |