aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Hector Chavez <lhchavez@google.com>2017-12-21 16:10:07 -0800
committerLuis Hector Chavez <lhchavez@google.com>2017-12-21 16:37:24 -0800
commit392bab8af81786c0094d3fc6eb476fe89f98e84f (patch)
tree6b1adb85f01810760c697e3afdaa8cdd781439b3
parent2256d987b3a5bffb7da4a7212a2e482d45785957 (diff)
downloadlibmojo-392bab8af81786c0094d3fc6eb476fe89f98e84f.tar.gz
libmojo: Update the Makefile for Chrome OS
This change makes it possible to build libmojo in Chrome OS. Bug: None Test: emerge-${BOARD} libmojo (in Chrome OS) Change-Id: I9897448a1b9e0cfbdec40a6dd10f7d264a2306f5
-rw-r--r--Makefile7
-rw-r--r--libmojo.pc.in2
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cd08c43..cc20ede 100644
--- a/Makefile
+++ b/Makefile
@@ -173,9 +173,12 @@ install_lib: all
sed -e "s:@LIB@:$(LIB):g" -e "s:@BSLOT@:$(BASE_VER):g" $(S)/libmojo.pc.in > $(S)/libmojo-$(BASE_VER).pc
install_tool:
- install -d $(DESTDIR)/usr/src/libmojo-$(BASE_VER)/mojo/
+ install -d $(DESTDIR)/usr/src/libmojo-$(BASE_VER)/mojo/public/tools/bindings/
+ install -d $(DESTDIR)/usr/src/libmojo-$(BASE_VER)/build/
cp -r --preserve=mode $(SRC)/third_party $(DESTDIR)/usr/src/libmojo-$(BASE_VER)/
cp -r --preserve=mode $(SRC)/mojo/public/tools/bindings/* \
- $(DESTDIR)/usr/src/libmojo-$(BASE_VER)/mojo/
+ $(DESTDIR)/usr/src/libmojo-$(BASE_VER)/mojo/public/tools/bindings/
+ cp -r --preserve=mode $(SRC)/build/* \
+ $(DESTDIR)/usr/src/libmojo-$(BASE_VER)/build/
install: install_lib install_tool
diff --git a/libmojo.pc.in b/libmojo.pc.in
index cceadd4..a750bdd 100644
--- a/libmojo.pc.in
+++ b/libmojo.pc.in
@@ -8,6 +8,6 @@ Name: libmojo
Description: Chrome Mojo IPC library
Requires.private:
Version: ${bslot}
-Libs: -lmojo-${bslot}.pie
+Libs: -lmojo-${bslot}.pic
Libs.private:
Cflags: -I${includedir}/libmojo-${bslot} -Wno-cast-qual -Wno-cast-align