Commit ff630892 authored by Charles Jacobsen's avatar Charles Jacobsen Committed by Vikram Narayanan
Browse files

build-refactor-2: libcap builds for isolated environment.

Still need to mash it together with liblcd. Going to use a
GNU ar script for that.
parent b2c197b7
......@@ -104,8 +104,7 @@ LIBLCD_BUILD_DIRS=$(foreach dir,$(LIBLCD_DIRS),\
LIBLCD_LIBCAP=$(LIBLCD_BUILD_DIR)/libcap.install/lib/libcap.a
LIBLCD_LIBCAP_CFLAGS= \
-DLCD_DOMAINS \
-I$(LCD_DOMAINS_TOP_SRC_DIR)/config/isolated
"-DLCD_DOMAINS -I$(LCD_DOMAINS_TOP_SRC_DIR)/include -I$(LCD_DOMAINS_TOP_SRC_DIR)/config/isolated"
liblcd: $(LIBLCD_BUILD_DIR)/Kbuild $(LIBLCD_LIBCAP) | \
$(LIBLCD_BUILD_DIRS)
......@@ -113,7 +112,7 @@ liblcd: $(LIBLCD_BUILD_DIR)/Kbuild $(LIBLCD_LIBCAP) | \
libcap.liblcd: $(LIBLCD_BUILD_DIR)/libcap.build/Makefile
$(MAKE) -C $(LIBLCD_BUILD_DIR)/libcap.build \
CFLAGS=$(LIBLCD_LIBCAP_CFLAGS) && \
CFLAGS=$(LIBLCD_LIBCAP_CFLAGS) && \
$(MAKE) -C $(LIBLCD_BUILD_DIR)/libcap.build install
$(LIBLCD_BUILD_DIR)/libcap.build/Makefile: libcap/configure | \
......@@ -121,8 +120,8 @@ $(LIBLCD_BUILD_DIR)/libcap.build/Makefile: libcap/configure | \
cd $(LIBLCD_BUILD_DIR)/libcap.build && \
$(LCD_DOMAINS_TOP_SRC_DIR)/libcap/configure \
PLATFORM=kernel --disable-test-build \
--with-kernel-headers=$(LCD_DOMAINS_TOP_SRC_DIR)/.. \
--disable-kernel-module \
--with-kernel-headers=$(LCD_DOMAINS_TOP_SRC_DIR)/.. \
--prefix=$(LIBLCD_BUILD_DIR)/libcap.install
$(LIBLCD_BUILD_DIR)/Kbuild: scripts/Kbuild.liblcd | \
......@@ -142,8 +141,12 @@ libcap/configure: libcap/configure.ac
# clean
clean:
$(MAKE) -C .. M=$(MICROKERNEL_BUILD_DIR) clean
$(MAKE) -C .. M=$(LIBLCD_BUILD_DIR) clean
if test -e $(MICROKERNEL_BUILD_DIR)/Makefile; then \
$(MAKE) -C .. M=$(MICROKERNEL_BUILD_DIR) clean; \
fi
if test -e $(LIBLCD_BUILD_DIR)/Makefile; then \
$(MAKE) -C .. M=$(LIBLCD_BUILD_DIR) clean; \
fi
if test -d $(MICROKERNEL_BUILD_DIR)/libcap.build; then \
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libcap.build clean; \
fi
......
Subproject commit bfd4615a2fa9fe5e3632a604cd211d54f5d087d0
Subproject commit 54c7670a8c686e1af35bce031aa466b39f37a643
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment