diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-05-05 18:50:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-05-05 18:50:44 +0200 |
| commit | 7de0af6d17ba07beb89115776f94a306da702b6a (patch) | |
| tree | 79d97af3519c2f827f0ffc0a1940e23b0fe854d4 | |
| parent | 98bb67c34d5c9eee9fc5254e7674b530949fc16e (diff) | |
| parent | 537f708094a4699a57d2960e151013343a942a9d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/bind/Makefile | 12 | ||||
| -rw-r--r-- | rules.mk | 10 | ||||
| -rw-r--r-- | target/mips/Makefile | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/package/bind/Makefile b/package/bind/Makefile index 920aba93a..67f6d7a03 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -18,22 +18,22 @@ PKG_NEED_CXX:= 1 PKG_SUBPKGS:= BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND PKGSD_BIND_NSUPDATE:= nsupdate utility PKGSC_BIND_NSUPDATE:= dns -PKGSS_BIND_NSUPDATE:= libbind +PKGSS_BIND_NSUPDATE:= libbind libopenssl libxml2 PKGSD_BIND_RNDC:= rndc & rndc-confgen utilities PKGSC_BIND_RNDC:= dns -PKGSS_BIND_RNDC:= libbind +PKGSS_BIND_RNDC:= libbind libopenssl libxml2 PKGSD_BIND_CHECK:= check utilities PKGSC_BIND_CHECK:= dns -PKGSS_BIND_CHECK:= libbind +PKGSS_BIND_CHECK:= libbind libopenssl libxml2 PKGSD_BIND_DNSSEC:= dnssec utilities PKGSC_BIND_DNSSEC:= dns -PKGSS_BIND_DNSSEC:= libbind +PKGSS_BIND_DNSSEC:= libbind libopenssl libxml2 PKGSD_BIND_HOST:= host utility PKGSC_BIND_HOST:= dns -PKGSS_BIND_HOST:= libbind +PKGSS_BIND_HOST:= libbind libopenssl libxml2 PKGSD_BIND_DIG:= dig utility PKGSC_BIND_DIG:= dns -PKGSS_BIND_DIG:= libbind +PKGSS_BIND_DIG:= libbind libopenssl libxml2 PKGSD_LIBBIND:= library for the bind software suite PKGSC_LIBBIND:= libs @@ -48,10 +48,14 @@ include $(TOPDIR)/target/$(ADK_TARGET_ARCH)/target.mk endif endif -include $(TOPDIR)/mk/vars.mk +ifneq (${DEBUG},) +ADK_DEBUG:=y +endif +ifneq (${STATIC},) +ADK_STATIC:=y +endif -# needed? -#export BASH MAKE LANGUAGE LC_ALL OStype PATH +include $(TOPDIR)/mk/vars.mk CPPFLAGS_FOR_BUILD?= CFLAGS_FOR_BUILD?= -O2 -Wall diff --git a/target/mips/Makefile b/target/mips/Makefile index 6264c3f1b..36909b6b7 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -57,6 +57,10 @@ ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y) kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel endif +ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) +kernel-install: + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel +endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL) |