Add new Makefiles.

woce · Oct 15, 2012 · dec7baa · dec7baa
1 parent 32887e6
commit dec7baa
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/packages/isis/Makefile → packages/isis/Makefile.WebKit b/packages/isis/Makefile → packages/isis/Makefile.WebKit
@@ -58,7 +58,7 @@ ISIS_ENV += WEBKITOUTPUTDIR="WebKitBuild/isis-armv7"
 
 .PHONY: build unpack patch package
 package:: ipkgs/${APP_ID}-$(CONFIG)_${VERSION}_armv7.ipk
-build:: build/$(CONFIG)/.built-${VERSION}
+build:: build/$(CONFIG)/.built-WebKit-${VERSION}
 unpack: build/$(CONFIG)/.unpacked
 
 $(call DL,ISIS)
@@ -70,10 +70,10 @@ build/$(CONFIG)/.unpacked: $(ISIS_DL)
 	$(call EXTRACT,ISIS,build/$(CONFIG)/src,--strip=1)
 	touch $@
 
-build/$(CONFIG)/.config-${VERSION}: build/$(CONFIG)/.unpacked
+build/$(CONFIG)/.config-WebKit-${VERSION}: build/$(CONFIG)/.unpacked
 	touch $@
 
-build/$(CONFIG)/.built-${VERSION}: build/$(CONFIG)/.config-${VERSION}
+build/$(CONFIG)/.built-WebKit-${VERSION}: build/$(CONFIG)/.config-WebKit-${VERSION}
 	cd build/$(CONFIG)/src && \
 	$(ISIS_ENV) ./WebKit/Tools/Scripts/build-webkit --qt \
 	--release \

diff --git a/packages/isis/Makefile.pbnjson b/packages/isis/Makefile.pbnjson
@@ -0,0 +1,32 @@
+VERSION  = 0.0.1
+
+LEVEL=../..
+
+build::
+
+include $(LEVEL)/Makefile.common
+
+.PHONY: build unpack
+build:: build/$(CONFIG)/.built-pbjson-${VERSION}
+unpack: build/$(CONFIG)/.unpacked
+
+### Unpack the software and build it
+build/$(CONFIG)/.unpacked: $(ISIS_DL)
+	-rm -rf build/$(CONFIG)
+	mkdir -p build/$(CONFIG)/src
+	$(call EXTRACT,ISIS,build/$(CONFIG)/src,--strip=1)
+	touch $@
+
+build/$(CONFIG)/.config-pbjson-${VERSION}: build/$(CONFIG)/.unpacked
+	cp -R build/$(CONFIG)/src/cmake-modules-webos/webOS build/$(CONFIG)/src/libpbnjson/
+	touch $@
+
+build/$(CONFIG)/.built-pbjson-${VERSION}: build/$(CONFIG)/.config-pbjson-${VERSION}
+	mkdir build/$(CONFIG)/src/libpbnjson/BUILD && \
+	cd build/$(CONFIG)/src/libpbnjson/BUILD && \
+	cmake -DWEBOS_INSTALL_ROOT:PATH=$(STAGING_DIR) .. && \
+	make && \
+	make install
+	touch $@
+
+
diff --git a/support/install-headers.mk b/support/install-headers.mk
@@ -7,5 +7,5 @@ staging/armv7/usr/include/.staged: staging/$(WOCE_ARCH)/.unpacked $(BUILD_SUPPOR
 	mkdir -p staging/armv7/usr/include
 	tar -C staging/armv7/usr/include --strip=4 --wildcards -axf $(BUILD_SUPPORT_DL) 'woce-build-support-[a-f0-9]*/staging/arm-none-linux-gnueabi/include'
 	tar -C staging/armv7/usr/lib --strip=4 --wildcards -axf $(BUILD_SUPPORT_DL) 'woce-build-support-[a-f0-9]*/staging/arm-none-linux-gnueabi/lib'
-	ln -s staging/armv7/usr/lib/libsqlite3.so.0 staging/armv7/usr/lib/libsqlite3.so
+	ln -s libsqlite3.so.0 staging/armv7/usr/lib/libsqlite3.so
 	touch $@