Index: ports/ipython-ppapi/Makefile |
diff --git a/ports/python-ppapi/Makefile b/ports/ipython-ppapi/Makefile |
similarity index 65% |
copy from ports/python-ppapi/Makefile |
copy to ports/ipython-ppapi/Makefile |
index 4eeec15070052e7d54a3cf945f8aa9f42b6cac61..efb8ac8cb0e6015e9ae9bd71925701883053af30 100644 |
--- a/ports/python-ppapi/Makefile |
+++ b/ports/ipython-ppapi/Makefile |
@@ -6,8 +6,8 @@ VALID_TOOLCHAINS := glibc newlib pnacl |
NACL_SDK_ROOT ?= $(abspath $(CURDIR)/../..) |
include $(NACL_SDK_ROOT)/tools/common.mk |
-TARGET = python |
-LIBS = python2.7 readline ncurses ppapi_simple tar nacl_io ppapi_cpp ppapi |
+TARGET = kernel |
+LIBS = python2.7 freetype bz2 ssl crypto z png readline ncurses ppapi_simple tar nacl_io ppapi_cpp ppapi |
NACL_LDFLAGS += $(NACL_CLI_MAIN_LIB) |
PNACL_LDFLAGS += $(NACL_CLI_MAIN_LIB) |
ifeq ($(TOOLCHAIN),glibc) |
@@ -16,9 +16,9 @@ NACL_LDFLAGS += -Wl,-export-dynamic |
else |
LIBS += glibc-compat |
endif |
-SOURCES = python.c |
+SOURCES = kernel.cc |
INC_PATHS = $(NACLPORTS_INCLUDE)/python2.7 |
-INSTALL_DIR = $(NACL_PACKAGES_PUBLISH)/python/$(TOOLCHAIN) |
+INSTALL_DIR = $(NACL_PACKAGES_PUBLISH)/ipython/$(TOOLCHAIN) |
ifeq ($(TOOLCHAIN),pnacl) |
EXEEXT=.pexe |
@@ -52,29 +52,13 @@ ifeq ($(TOOLCHAIN),glibc) |
EXTRA_ASSETS = lib/libz.so.1 lib/libreadline.so lib/libncurses.so.5 |
endif |
-CHROMEAPPS = $(NACL_SRC)/third_party/libapps/ |
-LIB_DOT = $(CHROMEAPPS)/libdot |
-NASSH = $(CHROMEAPPS)/nassh |
- |
install: |
mkdir -p $(INSTALL_DIR) |
tar -h -c -C ${NACLPORTS_PREFIX} -f $(INSTALL_DIR)/pydata_$(NACL_ARCH).tar lib/python2.7 ${EXTRA_ASSETS} |
- LIBDOT_SEARCH_PATH=$(CHROMEAPPS) $(LIB_DOT)/bin/concat.sh -i $(NASSH)/concat/nassh_deps.concat -o $(INSTALL_DIR)/hterm.concat.js |
- cp $(OUTDIR)/python*$(EXEEXT) $(INSTALL_DIR) |
+ cp $(OUTDIR)/$(TARGET)*$(EXEEXT) $(INSTALL_DIR) |
rm -f $(INSTALL_DIR)/*_unstripped_*$(EXEEXT) |
- cp $(OUTDIR)/python.nmf $(INSTALL_DIR) |
- cp index.html $(INSTALL_DIR) |
- cp python.js $(INSTALL_DIR) |
- cp ../../build_tools/naclterm.js $(INSTALL_DIR) |
- cp manifest.json ${INSTALL_DIR} |
- cp background.js ${INSTALL_DIR} |
- cp icon_16.png ${INSTALL_DIR} |
- cp icon_48.png ${INSTALL_DIR} |
- cp icon_128.png ${INSTALL_DIR} |
-ifeq ($(TOOLCHAIN),pnacl) |
- sed -i.bak 's/x-nacl/x-pnacl/g' $(INSTALL_DIR)/naclterm.js |
-endif |
+ cp $(OUTDIR)/$(TARGET).nmf $(INSTALL_DIR) |
+ cp kernel.py $(INSTALL_DIR) |
ifeq ($(TOOLCHAIN),glibc) |
cp -r $(OUTDIR)/lib* $(INSTALL_DIR) |
endif |
- cd $(INSTALL_DIR) && rm -f python.zip && zip -r python.zip . |