uPDF: move libjbig2dec and libopenjpeg to sdk/sources

git-svn-id: svn://kolibrios.org@8619 a494cfbc-eb01-0410-851d-a64ba20cac60

contrib/media/updf/fitz/Makefile

@@ -5,7 +5,7 @@ SDK_DIR = $(abspath ../../../sdk)
 
 CFLAGS = -c -fno-ident -O2 -fomit-frame-pointer -fno-ident -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 
 
-INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I ../libopenjpeg -I ../libjbig2dec
+INCLUDES = -I $(SDK_DIR)/sources/newlib/libc/include -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I $(SDK_DIR)/sources/libopenjpeg -I $(SDK_DIR)/sources/libjbig2dec
 
 FITZ_SRC := $(notdir $(wildcard *.c))
 OBJECTS =  $(patsubst %.c, %.o, $(FITZ_SRC))

contrib/media/updf/fitz/Tupfile.lua

@@ -6,7 +6,7 @@ tup.include(HELPERDIR .. "/use_newlib.lua")
 SDK_DIR = "../../../sdk"
 
 CFLAGS = CFLAGS .. " -std=c99 -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32"
-INCLUDES = INCLUDES .. " -I . -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I ../libopenjpeg -I ../libjbig2dec"
+INCLUDES = INCLUDES .. " -I . -I $(SDK_DIR)/sources/freetype/include -I $(SDK_DIR)/sources/libjpeg -I $(SDK_DIR)/sources/zlib -I $(SDK_DIR)/sources/libopenjpeg -I $(SDK_DIR)/sources/libjbig2dec"
 
 compile_gcc{"base_error.c", "base_geometry.c", "base_getopt.c", "base_hash.c", "base_memory.c", "base_object.c", "base_string.c", "base_time.c", "crypt_aes.c", "crypt_arc4.c", "crypt_md5.c", "crypt_sha2.c", "dev_bbox.c", "dev_list.c", "dev_null.c", "dev_text.c", "dev_trace.c", "filt_basic.c", "filt_dctd.c", "filt_faxd.c", "filt_flate.c", "filt_jbig2d.c", "filt_jpxd.c", "filt_lzwd.c", "filt_predict.c", "lrintf.c", "obj_print.c", "res_bitmap.c", "res_colorspace.c", "res_font.c", "res_halftone.c", "res_path.c", "res_pixmap.c", "res_shade.c", "res_text.c", "stm_buffer.c", "stm_open.c", "stm_read.c", "strtoll.c", "strtoull.c"}
 tup.rule(OBJS, "kos32-ar rcs %o %f", {"../lib/libfitz.a", "<../lib/libfitz>"})

contrib/sdk/sources/libjbig2dec/Makefile

@@ -12,7 +12,7 @@ OBJECTS =  $(patsubst %.c, %.o, $(SRC))
 default: $(patsubst %.c,%.o,$(SRC))
 	ar rcs libjbig2dec.a *.o
 	rm *.o
-	mv libjbig2dec.a ../lib
+	mv libjbig2dec.a ../../lib
 
 %.o : %.c Makefile $(SRC)
 	$(CC) $(CFLAGS) -DHAVE_CONFIG_H $(INCLUDES) -o $@ $<

contrib/sdk/sources/libjbig2dec/Tupfile.lua

@@ -7,4 +7,4 @@ CFLAGS = CFLAGS .. " -std=c99 -DHAVE_CONFIG_H"
 INCLUDES = INCLUDES .. " -I ."
  
 compile_gcc{"jbig2_arith.c", "jbig2_arith_iaid.c", "jbig2_arith_int.c", "jbig2.c", "jbig2dec.c", "jbig2_generic.c", "jbig2_halftone.c", "jbig2_huffman.c", "jbig2_image.c", "jbig2_image_pbm.c", "jbig2_metadata.c", "jbig2_mmr.c", "jbig2_page.c", "jbig2_refinement.c", "jbig2_segment.c", "jbig2_symbol_dict.c", "jbig2_text.c", "memcmp.c", "sha1.c"}
-tup.rule(OBJS, "kos32-ar rcs %o %f", {"../lib/libjbig2dec.a", "<../lib/libjbig2dec>"})
+tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libjbig2dec.a", "<../../lib/libjbig2dec>"})

contrib/sdk/sources/libopenjpeg/Makefile

@@ -12,7 +12,7 @@ OBJECTS =  $(patsubst %.c, %.o, $(SRC))
 default: $(patsubst %.c,%.o,$(SRC))
 	ar rcs libopenjpeg.a *.o
 	rm *.o
-	mv libopenjpeg.a ../lib
+	mv libopenjpeg.a ../../lib
 
 %.o : %.c Makefile $(SRC)
 	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<

contrib/sdk/sources/libopenjpeg/Tupfile.lua

@@ -9,4 +9,4 @@ CFLAGS = CFLAGS .. " -std=c99 -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN3
 INCLUDES = INCLUDES .. " -I ."
 
 compile_gcc{"bio.c", "cio.c", "dwt.c", "event.c", "image.c", "j2k.c", "j2k_lib.c", "jp2.c", "jpt.c", "lrintf.c", "mct.c", "mqc.c", "openjpeg.c", "pi.c", "raw.c", "t1.c", "t1_generate_luts.c", "t2.c", "tcd.c", "tgt.c"}
-tup.rule(OBJS, "kos32-ar rcs %o %f", {"../lib/libopenjpeg.a", "<../lib/libopenjpeg>"})
+tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libopenjpeg.a", "<../../lib/libopenjpeg>"})