Skip to content

Commit

Permalink
Move mozjpeg to deps folder
Browse files Browse the repository at this point in the history
  • Loading branch information
as-com committed Jun 20, 2016
1 parent a533fac commit 7d5070c
Show file tree
Hide file tree
Showing 489 changed files with 61 additions and 61 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jspm_packages
*.out.js.mem
*.app

mozjpeg/.libs
mozjpeg/.deps
deps/mozjpeg/.libs
deps/mozjpeg/.deps



Expand Down
8 changes: 4 additions & 4 deletions build-js.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
cd mozjpeg
cd deps/mozjpeg
emconfigure ./configure --without-simd --without-turbojpeg CFLAGS="-O3"
emmake make
cp .libs/cjpeg ../cjpeg.bc
cd ..
emcc -O3 --closure 1 --pre-js src/pre.js -s "EXPORTED_RUNTIME_METHODS=[]" -s ELIMINATE_DUPLICATE_FUNCTIONS=1 --memory-init-file 0 cjpeg.bc -o src/cjpeg.js -L'./mozjpeg/.libs' -ljpeg
cp .libs/cjpeg ../../cjpeg.bc
cd ../..
emcc -O3 --closure 1 --pre-js src/pre.js -s "EXPORTED_RUNTIME_METHODS=[]" -s ELIMINATE_DUPLICATE_FUNCTIONS=1 --memory-init-file 0 cjpeg.bc -o src/cjpeg.js -L'./deps/mozjpeg/.libs' -ljpeg
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 10 additions & 10 deletions mozjpeg/Makefile → deps/mozjpeg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -477,13 +477,13 @@ distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing aclocal-1.15
ACLOCAL = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing aclocal-1.15
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 0
AR = /home/andrew/bin/emsdk_portable/emscripten/master/emar
AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoconf
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing automake-1.15
AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoconf
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing automake-1.15
AWK = gawk
BUILD = 20160619
CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
Expand Down Expand Up @@ -532,7 +532,7 @@ LIPO =
LN_S = ln -s
LTLIBOBJS =
LT_SYS_LIBRARY_PATH =
MAKEINFO = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing makeinfo
MAKEINFO = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing makeinfo
MANIFEST_TOOL = :
MEM_SRCDST_FUNCTIONS = global: jpeg_mem_dest; jpeg_mem_src;
MKDIR_P = /bin/mkdir -p
Expand Down Expand Up @@ -569,10 +569,10 @@ STRIP = strip
VERSION = 3.1
VERSION_SCRIPT_FLAG = -Wl,--version-script,
WITH_JAVA = 0
abs_builddir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_srcdir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_top_builddir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_top_srcdir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_builddir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
abs_srcdir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
abs_top_builddir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
abs_top_srcdir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
ac_ct_AR =
ac_ct_CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
ac_ct_DUMPBIN =
Expand Down Expand Up @@ -601,7 +601,7 @@ host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/install-sh
install_sh = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/install-sh
libdir = ${exec_prefix}/lib64
libexecdir = ${exec_prefix}/libexec
libpng_CFLAGS =
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions mozjpeg/config.status → deps/mozjpeg/config.status
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."

ac_pwd='/home/andrew/Documents/mozjpeg-js/mozjpeg'
ac_pwd='/home/andrew/Documents/mozjpeg-js/deps/mozjpeg'
srcdir='.'
INSTALL='/usr/bin/install -c'
MKDIR_P='/bin/mkdir -p'
Expand Down Expand Up @@ -959,12 +959,12 @@ S["mkdir_p"]="$(MKDIR_P)"
S["MKDIR_P"]="/bin/mkdir -p"
S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
S["STRIP"]="strip"
S["install_sh"]="${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/install-sh"
S["MAKEINFO"]="${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing makeinfo"
S["AUTOHEADER"]="${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoheader"
S["AUTOMAKE"]="${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing automake-1.15"
S["AUTOCONF"]="${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoconf"
S["ACLOCAL"]="${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing aclocal-1.15"
S["install_sh"]="${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/install-sh"
S["MAKEINFO"]="${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing makeinfo"
S["AUTOHEADER"]="${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoheader"
S["AUTOMAKE"]="${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing automake-1.15"
S["AUTOCONF"]="${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoconf"
S["ACLOCAL"]="${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing aclocal-1.15"
S["VERSION"]="3.1"
S["PACKAGE"]="mozjpeg"
S["CYGPATH_W"]="echo"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 10 additions & 10 deletions mozjpeg/java/Makefile → deps/mozjpeg/java/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@ am__java_sources = $(nodist_noinst_JAVA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing aclocal-1.15
ACLOCAL = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing aclocal-1.15
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 0
AR = /home/andrew/bin/emsdk_portable/emscripten/master/emar
AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoconf
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing automake-1.15
AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoconf
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing automake-1.15
AWK = gawk
BUILD = 20160619
CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
Expand Down Expand Up @@ -178,7 +178,7 @@ LIPO =
LN_S = ln -s
LTLIBOBJS =
LT_SYS_LIBRARY_PATH =
MAKEINFO = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing makeinfo
MAKEINFO = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing makeinfo
MANIFEST_TOOL = :
MEM_SRCDST_FUNCTIONS = global: jpeg_mem_dest; jpeg_mem_src;
MKDIR_P = /bin/mkdir -p
Expand Down Expand Up @@ -215,10 +215,10 @@ STRIP = strip
VERSION = 3.1
VERSION_SCRIPT_FLAG = -Wl,--version-script,
WITH_JAVA = 0
abs_builddir = /home/andrew/Documents/mozjpeg-js/mozjpeg/java
abs_srcdir = /home/andrew/Documents/mozjpeg-js/mozjpeg/java
abs_top_builddir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_top_srcdir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_builddir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/java
abs_srcdir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/java
abs_top_builddir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
abs_top_srcdir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
ac_ct_AR =
ac_ct_CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
ac_ct_DUMPBIN =
Expand Down Expand Up @@ -247,7 +247,7 @@ host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/install-sh
install_sh = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/install-sh
libdir = ${exec_prefix}/lib64
libexecdir = ${exec_prefix}/libexec
libpng_CFLAGS =
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 10 additions & 10 deletions mozjpeg/md5/Makefile → deps/mozjpeg/md5/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@ ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing aclocal-1.15
ACLOCAL = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing aclocal-1.15
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 0
AR = /home/andrew/bin/emsdk_portable/emscripten/master/emar
AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoconf
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing automake-1.15
AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoconf
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing automake-1.15
AWK = gawk
BUILD = 20160619
CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
Expand Down Expand Up @@ -230,7 +230,7 @@ LIPO =
LN_S = ln -s
LTLIBOBJS =
LT_SYS_LIBRARY_PATH =
MAKEINFO = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/missing makeinfo
MAKEINFO = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing makeinfo
MANIFEST_TOOL = :
MEM_SRCDST_FUNCTIONS = global: jpeg_mem_dest; jpeg_mem_src;
MKDIR_P = /bin/mkdir -p
Expand Down Expand Up @@ -267,10 +267,10 @@ STRIP = strip
VERSION = 3.1
VERSION_SCRIPT_FLAG = -Wl,--version-script,
WITH_JAVA = 0
abs_builddir = /home/andrew/Documents/mozjpeg-js/mozjpeg/md5
abs_srcdir = /home/andrew/Documents/mozjpeg-js/mozjpeg/md5
abs_top_builddir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_top_srcdir = /home/andrew/Documents/mozjpeg-js/mozjpeg
abs_builddir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/md5
abs_srcdir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/md5
abs_top_builddir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
abs_top_srcdir = /home/andrew/Documents/mozjpeg-js/deps/mozjpeg
ac_ct_AR =
ac_ct_CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
ac_ct_DUMPBIN =
Expand Down Expand Up @@ -299,7 +299,7 @@ host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /home/andrew/Documents/mozjpeg-js/mozjpeg/install-sh
install_sh = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/install-sh
libdir = ${exec_prefix}/lib64
libexecdir = ${exec_prefix}/libexec
libpng_CFLAGS =
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 7d5070c

Please sign in to comment.