Permalink
Browse files

Fix compiling of libpbnjson. Bring download of WebKit package into ma…

…in Makefile.
  • Loading branch information...
1 parent 14b92fc commit 2a184ae4afae2104a188244cdd323da4a8357ed8 Donald Kirker committed Jan 1, 2013
Showing with 13 additions and 2 deletions.
  1. +12 −1 Makefile
  2. +1 −1 packages/isis/Makefile.pbnjson
View
@@ -43,6 +43,17 @@ downloads/.freetype:
scripts/get_freetype.sh $(LEVEL)
touch $@
+$(call DL,ISIS)
+
+### Unpack the software and build it
+packages/isis/build/$(CONFIG)/.unpacked: $(ISIS_DL)
+ -rm -rf packages/isis/build/$(CONFIG)
+ mkdir -p packages/isis/build/$(CONFIG)/src
+ $(call EXTRACT,ISIS,packages/isis/build/$(CONFIG)/src,--strip=1)
+ touch $@
+
+isis-download: packages/isis/build/$(CONFIG)/.unpacked
+
adapterbase:
$(MAKE) -C packages/isis -f Makefile.AdapterBase
@@ -76,7 +87,7 @@ enyo1:
webview: enyo1
echo "Need to do something about webview"
-isis: browseradapter browserserver webview
+isis: isis-download browseradapter browserserver webview
echo "We'll need to run a palm-package"
# Download and extract the toolchain
@@ -30,7 +30,7 @@ build/$(CONFIG)/.config-pbjson-${VERSION}: build/$(CONFIG)/.unpacked
build/$(CONFIG)/.built-pbjson-${VERSION}: build/$(CONFIG)/.config-pbjson-${VERSION}
mkdir -p build/$(CONFIG)/src/libpbnjson/BUILD && \
cd build/$(CONFIG)/src/libpbnjson/BUILD && \
- CC=$(CC) CXX=$(CXX) cmake -DCMAKE_INCLUDE_PATH:PATH=$(CMAKE_INCLUDES) -DCMAKE_LIBRARY_PATH:PATH=$(CMAKE_LIBS) -DCMAKE_MODULE_PATH:PATH=$(CMAKE_WEBOS) -DWEBOS_INSTALL_ROOT:PATH=$(STAGING_DIR) .. && \
+ CC=$(CC) CXX=$(CXX) cmake -DCMAKE_INCLUDE_PATH:PATH=$(CMAKE_INCLUDES) -DCMAKE_LIBRARY_PATH:PATH=$(CMAKE_LIBS) -DYAJL_LIBRARIES:PATH=$(CMAKE_LIBS)/libyajl.so -DCMAKE_MODULE_PATH:PATH=$(CMAKE_WEBOS) -DWEBOS_INSTALL_ROOT:PATH=$(STAGING_DIR) .. && \
make && \
make install
touch $@

0 comments on commit 2a184ae

Please sign in to comment.