diff options
| author | Zheng Da <zhengda1936@gmail.com> | 2010-01-13 11:45:56 +0100 |
|---|---|---|
| committer | Zheng Da <zhengda1936@gmail.com> | 2010-01-13 11:45:56 +0100 |
| commit | 2568808344d9e3cbb62edbb6404be2aff956052d (patch) | |
| tree | ff481cb5792d706bc6580fd4e94c4b11107d4543 /libdde_linux26 | |
| parent | 76f6b6637612a89be89e4aa38afe145a839fc1fb (diff) | |
move variables to Makeconf.local
Diffstat (limited to 'libdde_linux26')
| -rw-r--r-- | libdde_linux26/Makeconf | 2 | ||||
| -rw-r--r-- | libdde_linux26/Makeconf.local | 11 | ||||
| -rw-r--r-- | libdde_linux26/lib/src/Makefile | 11 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libdde_linux26/Makeconf b/libdde_linux26/Makeconf index f81b29da..c84466f8 100644 --- a/libdde_linux26/Makeconf +++ b/libdde_linux26/Makeconf @@ -13,8 +13,6 @@ ifeq ($(ARCH), arm) KBUILD_CPPFLAGS = -include linux/autoconf-arm.h endif -OBJ_BASE = /root/hurd/libdde_linux26/build - # includes MY_DDE_INCDIR = $(OBJ_BASE)/include/$(ARCH) \ $(OBJ_BASE)/include/ diff --git a/libdde_linux26/Makeconf.local b/libdde_linux26/Makeconf.local new file mode 100644 index 00000000..aa6207c3 --- /dev/null +++ b/libdde_linux26/Makeconf.local @@ -0,0 +1,11 @@ +CONFIG_DDE26_COMMON := y +CONFIG_DDE26_NET := y +CONFIG_DDE26_BLOCK := y +#CONFIG_DDE26_SOUND := y +CONFIG_DDE26_CHAR :=y + +SYSTEMS = x86-l4v2 +ARCH = x86 +SYSTEM = x86-l4v2 + +OBJ_BASE = /root/hurd/libdde_linux26/build diff --git a/libdde_linux26/lib/src/Makefile b/libdde_linux26/lib/src/Makefile index 21885805..8f31f9b8 100644 --- a/libdde_linux26/lib/src/Makefile +++ b/libdde_linux26/lib/src/Makefile @@ -2,17 +2,11 @@ PKGDIR ?= ../.. L4DIR ?= $(PKGDIR) CONTRIB ?= $(PKGDIR)/contrib --include $(PKGDIR_OBJ)/Makeconf +include $(PKGDIR)/Makeconf.local ifeq ($(origin SRC_DIR),undefined) SRC_DIR := $(shell pwd) endif -CONFIG_DDE26_COMMON := y -CONFIG_DDE26_NET := y -CONFIG_DDE26_BLOCK := y -#CONFIG_DDE26_SOUND := y -CONFIG_DDE26_CHAR :=y - ifeq ($(CONFIG_DDE26_COMMON),y) TARGET += libdde_linux26.o.a endif @@ -33,9 +27,6 @@ ifeq ($(CONFIG_DDE26_CHAR),y) TARGET += libdde_linux26_char.a endif -SYSTEMS = x86-l4v2 -ARCH = x86 - ifeq ($(ARCH), x86) ARCH_DIR = arch/x86 endif |