43 lines
2.8 KiB
Diff
43 lines
2.8 KiB
Diff
|
diff --git a/extrasrc/Makefile b/extrasrc/Makefile
|
||
|
|
index fb95845..77125c0 100644
|
||
|
|
--- a/extrasrc/Makefile
|
||
|
|
+++ b/extrasrc/Makefile
|
||
|
|
@@ -10,11 +10,11 @@ OUTDIR=$(SRCDIR)/out
|
||
|
|
GMOCK_DIR=$(SRCDIR)/gmock-$(GMOCK_VER)
|
||
|
|
GTEST_DIR=$(GMOCK_DIR)/gtest
|
||
|
|
|
||
|
|
-INCLUDES="-I$(SRCDIR)/include -I$(SRCDIR)/platform2/libchromeos -isystem $(GTEST_DIR)/include -I$(GMOCK_DIR)/include -I$(SRCDIR)/leveldb/include"
|
||
|
|
+INCLUDES="-I$(SRCDIR)/include -I$(SRCDIR)/platform2/libchromeos -isystem $(GTEST_DIR)/include -I$(GMOCK_DIR)/include -I$(SRCDIR)/leveldb/include $(NIX_LDFLAG) $(NIX_CFLAGS_COMPILE)"
|
||
|
|
|
||
|
|
# To build Chaps, defer to platform2/chaps/Makefile
|
||
|
|
all: libchrome-$(BASE_VER).a libchromeos-$(BASE_VER).a | out
|
||
|
|
- cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE)
|
||
|
|
+ cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE)
|
||
|
|
|
||
|
|
# To build required Chromium components, defer to scons file.
|
||
|
|
libchrome-$(BASE_VER).a:
|
||
|
|
@@ -38,7 +38,7 @@ out/libgmock.a: out/gmock-all.o
|
||
|
|
ar -rv $@ $<
|
||
|
|
|
||
|
|
test: out/libgtest.a out/libgmock.a libchrome-$(BASE_VER).a libchromeos-$(BASE_VER).a | out
|
||
|
|
- cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) LDLIBS="-L$(OUTDIR)" OUT=$(OUTDIR) $(MAKE) tests
|
||
|
|
+ cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) LDLIBS="-L$(OUTDIR)" OUT=$(OUTDIR) $(MAKE) tests
|
||
|
|
|
||
|
|
clean: clean_chaps clean_chromeos clean_chromebase clean_gmock clean_debian
|
||
|
|
clean_gmock:
|
||
|
|
@@ -49,7 +49,7 @@ clean_chromebase:
|
||
|
|
clean_chromeos:
|
||
|
|
-BASE_VER=$(BASE_VER) scons -f Sconstruct.libchromeos -c
|
||
|
|
clean_chaps:
|
||
|
|
- -cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) $(MAKE) clean
|
||
|
|
+ -cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) $(MAKE) clean
|
||
|
|
rm -rf out
|
||
|
|
clean_debian:
|
||
|
|
dh_clean
|
||
|
|
@@ -64,4 +64,4 @@ install_man:
|
||
|
|
$(INSTALL) -m 0644 -D man/chapsd.8 $(MANDIR)/man8/chapsd.8
|
||
|
|
$(INSTALL) -m 0644 -D man/chaps_client.8 $(MANDIR)/man8/chaps_client.8
|
||
|
|
install: install_man
|
||
|
|
- cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE) install_files
|
||
|
|
+ cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE) install_files
|