diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-26 12:58:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-26 12:58:05 +0200 |
| commit | b3a99d7f44680ef629ceea377cf9938fec94921d (patch) | |
| tree | d3a0cc80dbc218c086e1c5b2635a987a534c0163 /mk | |
| parent | 2d4dff630b0184fff9833dbdaaa745c3371994d1 (diff) | |
| parent | 07417b486967bb96dd53e382af96ab5aee973548 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 13 | ||||
| -rw-r--r-- | mk/modules.mk | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 793145be0..f33fd5ad2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -58,6 +58,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ + guiconfig \ _config \ _mconfig \ distclean \ @@ -261,7 +262,7 @@ all: menuconfig # --------------------------------------------------------------------------- # force entering the subdir, as dependency checking is done there -.PHONY: $(CONFIG)/conf $(CONFIG)/mconf +.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/gconf $(CONFIG)/conf: @$(MAKE) -C $(CONFIG) conf @@ -269,6 +270,9 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) +$(CONFIG)/gconf: + @$(MAKE) -C $(CONFIG) gconf + defconfig: .menu $(CONFIG)/conf ifeq (${OStype},Linux) @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig @@ -415,6 +419,13 @@ menuconfig: $(CONFIG)/mconf defconfig .menu @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} +guiconfig: $(CONFIG)/gconf defconfig .menu + @if [ ! -f .config ];then \ + $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ + fi + @$(CONFIG)/gconf $(CONFIG_CONFIG_IN) + ${POSTCONFIG} + _config: $(CONFIG)/conf .menu -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) diff --git a/mk/modules.mk b/mk/modules.mk index 3260f8d38..5744b2109 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -786,6 +786,10 @@ $(eval $(call KMOD_template,CRYPTO_HMAC,crypto-hmac,\ $(MODULES_DIR)/kernel/crypto/hmac \ ,11)) +$(eval $(call KMOD_template,CRYPTO_XCBC,crypto-xcbc,\ + $(MODULES_DIR)/kernel/crypto/xcbc \ +,11)) + $(eval $(call KMOD_template,CRYPTO_NULL,crypto-null,\ $(MODULES_DIR)/kernel/crypto/crypto_null \ ,11)) |