diff --git a/jni/Android.mk b/jni/Android.mk
index ccd854f..7479145 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,36 +1,36 @@
 
 LOCAL_PATH:= $(call my-dir)
 LOCAL_CODECS_PATH = sflphone/daemon/src/audio/codecs
-LOCAL_AUDIO_PATH = sflphone/daemon/src/audio
 LOCAL_SRC_PATH = sflphone/daemon/src
 
 
 include $(CLEAR_VARS)
 # /!\ absolutely necessary when including submakefiles
 # and defining targets in the "same Android.mk"
-#include $(call all-subdir-makefiles)
+include $(LOCAL_PATH)/libopus/Android.mk
+include $(LOCAL_PATH)/libsndfile/Android.mk
+include $(LOCAL_PATH)/libpcre/Android.mk
+include $(LOCAL_PATH)/libgsm/Android.mk
+include $(LOCAL_PATH)/libccrtp/Android.mk
+include $(LOCAL_PATH)/libspeex/Android.mk
+include $(LOCAL_PATH)/libyaml/Android.mk
+include $(LOCAL_PATH)/libsamplerate/Android.mk
+include $(LOCAL_PATH)/libexpat/Android.mk
+include $(LOCAL_PATH)/libopenssl/Android.mk
+include $(LOCAL_PATH)/commoncpp2-android/Android.mk
+include $(LOCAL_PATH)/libzrtp/Android.mk
 
 # FIXME
 VERSION="1.1.0"
 MY_PREFIX=/sdcard
 MY_DATADIR=/data/data
 TARGET_NAME=arm-unknown-linux-androideabi
-
-LOCAL_CODECS_PATH = sflphone/daemon/src/audio/codecs
-
 MY_PJPROJECT=pjproject-android
-MY_COMMONCPP=commoncpp2-android
-MY_CCRTP=ccrtp-android
-MY_LIBSAMPLE=libsamplerate
-MY_SPEEX=libspeex
-MY_OPENSSL=openssl
-MY_LIBYAML=libyaml
-MY_PCRE=libpcre
-MY_LIBZRTPCPP = libzrtp
-MY_LIBEXPAT=libexpat
-MY_OPUS=libopus
-MY_LIBSNDFILE=libsndfile
-MY_LIBGSM=libgsm
+MY_COMMONCPP=commoncpp2-android/sources
+MY_CCRTP=libccrtp/sources
+MY_OPENSSL=libopenssl
+
+
 MY_JNI_WRAP := $(LOCAL_SRC_PATH)/client/android/callmanager_wrap.cpp
 
 include $(CLEAR_VARS)
@@ -39,6 +39,8 @@
 	@echo "in $(MY_JNI_WRAP) target"
 	./make-swig.sh
 
+
+
 LOCAL_SRC_FILES := \
 		$(LOCAL_SRC_PATH)/conference.cpp \
 		$(LOCAL_SRC_PATH)/voiplink.cpp \
@@ -121,7 +123,6 @@
 			$(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP)/inc \
 			$(APP_PROJECT_PATH)/jni/$(MY_COMMONCPP) \
 			$(APP_PROJECT_PATH)/jni/$(MY_LIBYAML)/inc \
-			$(APP_PROJECT_PATH)/jni/$(MY_PCRE) \
 			$(APP_PROJECT_PATH)/jni/$(MY_LIBZRTPCPP)/src/ \
 			$(APP_PROJECT_PATH)/jni/$(MY_LIBZRTPCPP) \
 			$(APP_PROJECT_PATH)/jni/$(MY_LIBZRTPCPP)/zrtp \
@@ -134,7 +135,8 @@
 			$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjmedia/include \
 			$(APP_PROJECT_PATH)/jni/$(MY_PJPROJECT)/pjnath/include \
 			$(APP_PROJECT_PATH)/jni/$(MY_LIBEXPAT) \
-			$(APP_PROJECT_PATH)/jni/$(MY_LIBSNDFILE)/src
+			$(APP_PROJECT_PATH)/jni/libsndfile/sources/src \
+			$(APP_PROJECT_PATH)/jni/libpcre/sources \
 
 LOCAL_MODULE := libsflphone
 
@@ -170,15 +172,9 @@
 		 -lpjnath-$(TARGET_NAME) \
 		 -lpjlib-util-$(TARGET_NAME) \
 		 -lpj-$(TARGET_NAME) \
-		 -lccgnu2 \
-		 -lsamplerate \
-		 -lspeexresampler \
-		 -lsamplerate \
-		 -lcrypto \
 		 -lz \
 		 -llog \
 		 -lOpenSLES \
-		 -lgnustl_shared
 
 # LOCAL_STATIC_LIBRARIES (NDK documentation)
 #   The list of static libraries modules (built with BUILD_STATIC_LIBRARY)
@@ -194,82 +190,19 @@
 							libpjlib-util-$(TARGET_NAME) \
 							libpj-$(TARGET_NAME) \
 							libssl \
+							libpcre \
+							libccgnu2 \
 							libsamplerate \
-							libcrypto \
+							libcrypto_static \
+							libsndfile \
 						
 
 
 LOCAL_SHARED_LIBRARIES += libccrtp1 \
 				libexpat_shared \
-				libpcre \
 				libspeexresampler \
 				libyaml \
-				libsndfile \
-
-include $(BUILD_SHARED_LIBRARY)
-
-############### libsndfile ##################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE   := libsndfile
-
-LOCAL_SRC_FILES := 	$(MY_LIBSNDFILE)/src/mat5.c \
-					$(MY_LIBSNDFILE)/src/windows.c \
-					$(MY_LIBSNDFILE)/src/G72x/g723_24.c \
-					$(MY_LIBSNDFILE)/src/G72x/g72x.c \
-					$(MY_LIBSNDFILE)/src/G72x/g723_40.c \
-					$(MY_LIBSNDFILE)/src/G72x/g721.c \
-					$(MY_LIBSNDFILE)/src/G72x/g723_16.c \
-					$(MY_LIBSNDFILE)/src/float32.c \
-					$(MY_LIBSNDFILE)/src/chanmap.c $(MY_LIBSNDFILE)/src/test_endswap.c $(MY_LIBSNDFILE)/src/rf64.c \
-					$(MY_LIBSNDFILE)/src/sndfile.c \
-					$(MY_LIBSNDFILE)/src/htk.c $(MY_LIBSNDFILE)/src/dither.c \
-       				$(MY_LIBSNDFILE)/src/test_log_printf.c $(MY_LIBSNDFILE)/src/txw.c \
-					$(MY_LIBSNDFILE)/src/ms_adpcm.c $(MY_LIBSNDFILE)/src/ima_adpcm.c \
-					$(MY_LIBSNDFILE)/src/flac.c $(MY_LIBSNDFILE)/src/aiff.c \
-					$(MY_LIBSNDFILE)/src/wav.c \
-					$(MY_LIBSNDFILE)/src/macbinary3.c \
-					$(MY_LIBSNDFILE)/src/mat4.c \
-					$(MY_LIBSNDFILE)/src/pcm.c \
-					$(MY_LIBSNDFILE)/src/caf.c \
-					$(MY_LIBSNDFILE)/src/audio_detect.c \
-					$(MY_LIBSNDFILE)/src/id3.c \
-					$(MY_LIBSNDFILE)/src/alaw.c $(MY_LIBSNDFILE)/src/macos.c $(MY_LIBSNDFILE)/src/file_io.c $(MY_LIBSNDFILE)/src/broadcast.c \
-					$(MY_LIBSNDFILE)/src/double64.c \
-					$(MY_LIBSNDFILE)/src/raw.c $(MY_LIBSNDFILE)/src/test_broadcast_var.c \
-					$(MY_LIBSNDFILE)/src/g72x.c $(MY_LIBSNDFILE)/src/command.c \
-					$(MY_LIBSNDFILE)/src/chunk.c $(MY_LIBSNDFILE)/src/avr.c \
-					$(MY_LIBSNDFILE)/src/sd2.c $(MY_LIBSNDFILE)/src/voc.c \
-					$(MY_LIBSNDFILE)/src/test_audio_detect.c \
-					$(MY_LIBSNDFILE)/src/mpc2k.c $(MY_LIBSNDFILE)/src/gsm610.c $(MY_LIBSNDFILE)/src/dwd.c \
-					$(MY_LIBSNDFILE)/src/interleave.c $(MY_LIBSNDFILE)/src/common.c \
-					$(MY_LIBSNDFILE)/src/test_strncpy_crlf.c $(MY_LIBSNDFILE)/src/sds.c \
-					$(MY_LIBSNDFILE)/src/pvf.c $(MY_LIBSNDFILE)/src/paf.c \
-					$(MY_LIBSNDFILE)/src/au.c \
-					$(MY_LIBSNDFILE)/src/test_float.c \
-					$(MY_LIBSNDFILE)/src/vox_adpcm.c $(MY_LIBSNDFILE)/src/ulaw.c \
-					$(MY_LIBSNDFILE)/src/strings.c $(MY_LIBSNDFILE)/src/svx.c \
-					$(MY_LIBSNDFILE)/src/test_conversions.c $(MY_LIBSNDFILE)/src/rx2.c \
-					$(MY_LIBSNDFILE)/src/nist.c \
-					$(MY_LIBSNDFILE)/src/GSM610/code.c $(MY_LIBSNDFILE)/src/GSM610/gsm_destroy.c \
-					$(MY_LIBSNDFILE)/src/GSM610/gsm_decode.c $(MY_LIBSNDFILE)/src/GSM610/short_term.c $(MY_LIBSNDFILE)/src/GSM610/gsm_create.c \
-					$(MY_LIBSNDFILE)/src/GSM610/decode.c $(MY_LIBSNDFILE)/src/GSM610/gsm_option.c \
-					$(MY_LIBSNDFILE)/src/GSM610/long_term.c $(MY_LIBSNDFILE)/src/GSM610/table.c $(MY_LIBSNDFILE)/src/GSM610/rpe.c $(MY_LIBSNDFILE)/src/GSM610/preprocess.c \
-					$(MY_LIBSNDFILE)/src/GSM610/gsm_encode.c $(MY_LIBSNDFILE)/src/GSM610/lpc.c \
-					$(MY_LIBSNDFILE)/src/GSM610/add.c $(MY_LIBSNDFILE)/src/dwvw.c \
-					$(MY_LIBSNDFILE)/src/wav_w64.c $(MY_LIBSNDFILE)/src/wve.c $(MY_LIBSNDFILE)/src/ogg.c $(MY_LIBSNDFILE)/src/w64.c \
-					$(MY_LIBSNDFILE)/src/test_file_io.c \
-					$(MY_LIBSNDFILE)/src/ircam.c $(MY_LIBSNDFILE)/src/xi.c $(MY_LIBSNDFILE)/src/ima_oki_adpcm.c
-
-LOCAL_C_INCLUDES += $(APP_PROJECT_PATH)/jni/$(MY_LIBSNDFILE)/src \
-					$(APP_PROJECT_PATH)/jni/sflphone/daemon/src
-
-LOCAL_LDLIBS  += -L$(APP_PROJECT_PATH)/obj/local/armeabi-v7a \
-			
-
-
-LOCAL_LDLIBS := -llog
+				
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -366,27 +299,9 @@
 
 include $(CLEAR_VARS)
 
-
-
 LOCAL_SRC_FILES := 	$(LOCAL_CODECS_PATH)/gsmcodec.cpp \
 					$(LOCAL_CODECS_PATH)/audiocodec.cpp \
-					$(MY_LIBGSM)/src/add.c \
-					$(MY_LIBGSM)/src/debug.c \
-					$(MY_LIBGSM)/src/gsm_create.c \
-					$(MY_LIBGSM)/src/gsm_destroy.c \
-					$(MY_LIBGSM)/src/gsm_explode.c \
-					$(MY_LIBGSM)/src/gsm_option.c \
-					$(MY_LIBGSM)/src/long_term.c \
-					$(MY_LIBGSM)/src/preprocess.c \
-					$(MY_LIBGSM)/src/short_term.c \
-					$(MY_LIBGSM)/src/code.c \
-					$(MY_LIBGSM)/src/gsm_decode.c \
-					$(MY_LIBGSM)/src/gsm_encode.c \
-					$(MY_LIBGSM)/src/decode.c \
-					$(MY_LIBGSM)/src/gsm_print.c \
-					$(MY_LIBGSM)/src/lpc.c \
-					$(MY_LIBGSM)/src/rpe.c \
-					$(MY_LIBGSM)/src/table.c \
+
 
 LOCAL_C_INCLUDES += $(LOCAL_CODECS_PATH)/.. \
 			$(LOCAL_CODECS_PATH)/../.. \
@@ -395,6 +310,8 @@
 
 LOCAL_MODULE := libcodec_gsm
 
+LOCAL_STATIC_LIBRARIES = libgsm
+
 LOCAL_LDLIBS := -llog
 
 LOCAL_CPPFLAGS += $(NETWORKMANAGER) \
@@ -408,203 +325,6 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-############# libopus ###############
-
-include $(CLEAR_VARS)
-
-LOCAL_CELT_SOURCES := 	$(MY_OPUS)/celt/bands.c \
-						$(MY_OPUS)/celt/celt_lpc.c \
-						$(MY_OPUS)/celt/rate.c \
-						$(MY_OPUS)/celt/entenc.c \
-						$(MY_OPUS)/celt/modes.c \
-						$(MY_OPUS)/celt/mdct.c \
-						$(MY_OPUS)/celt/entcode.c \
-						$(MY_OPUS)/celt/celt.c \
-						$(MY_OPUS)/celt/laplace.c \
-						$(MY_OPUS)/celt/cwrs.c \
-						$(MY_OPUS)/celt/quant_bands.c \
-						$(MY_OPUS)/celt/opus_custom_demo.c \
-						$(MY_OPUS)/celt/pitch.c \
-						$(MY_OPUS)/celt/entdec.c \
-						$(MY_OPUS)/celt/kiss_fft.c \
-						$(MY_OPUS)/celt/mathops.c \
-						$(MY_OPUS)/celt/vq.c
-    
-
-LOCAL_SILK_SOURCES :=  	$(MY_OPUS)/silk/CNG.c \
-						$(MY_OPUS)/silk/VQ_WMat_EC.c \
-						$(MY_OPUS)/silk/tables_pulses_per_block.c \
-						$(MY_OPUS)/silk/check_control_input.c \
-						$(MY_OPUS)/silk/NLSF_encode.c \
-						$(MY_OPUS)/silk/gain_quant.c \
-						$(MY_OPUS)/silk/stereo_MS_to_LR.c \
-						$(MY_OPUS)/silk/control_SNR.c \
-						$(MY_OPUS)/silk/stereo_decode_pred.c \
-						$(MY_OPUS)/silk/init_encoder.c \
-						$(MY_OPUS)/silk/bwexpander_32.c \
-						$(MY_OPUS)/silk/ana_filt_bank_1.c \
-						$(MY_OPUS)/silk/control_codec.c \
-						$(MY_OPUS)/silk/stereo_encode_pred.c \
-						$(MY_OPUS)/silk/shell_coder.c \
-						$(MY_OPUS)/silk/PLC.c \
-						$(MY_OPUS)/silk/encode_pulses.c \
-						$(MY_OPUS)/silk/resampler_rom.c \
-						$(MY_OPUS)/silk/stereo_quant_pred.c \
-						$(MY_OPUS)/silk/CNG.c \
-						$(MY_OPUS)/silk/biquad_alt.c \
-						$(MY_OPUS)/silk/resampler_down2_3.c \
-						$(MY_OPUS)/silk/VAD.c \
-						$(MY_OPUS)/silk/LPC_analysis_filter.c \
-						$(MY_OPUS)/silk/NSQ_del_dec.c \
-						$(MY_OPUS)/silk/NLSF_stabilize.c \
-						$(MY_OPUS)/silk/tables_pitch_lag.c \
-						$(MY_OPUS)/silk/decode_indices.c \
-						$(MY_OPUS)/silk/NLSF_del_dec_quant.c \
-						$(MY_OPUS)/silk/A2NLSF.c \
-						$(MY_OPUS)/silk/resampler.c \
-						$(MY_OPUS)/silk/decode_frame.c \
-						$(MY_OPUS)/silk/tables_other.c \
-						$(MY_OPUS)/silk/tables_NLSF_CB_NB_MB.c \
-						$(MY_OPUS)/silk/decode_pitch.c \
-						$(MY_OPUS)/silk/resampler_down2.c \
-						$(MY_OPUS)/silk/encode_indices.c \
-						$(MY_OPUS)/silk/decode_parameters.c \
-						$(MY_OPUS)/silk/resampler_private_AR2.c \
-						$(MY_OPUS)/silk/init_decoder.c \
-						$(MY_OPUS)/silk/quant_LTP_gains.c \
-						$(MY_OPUS)/silk/decode_core.c \
-						$(MY_OPUS)/silk/enc_API.c \
-						$(MY_OPUS)/silk/code_signs.c \
-						$(MY_OPUS)/silk/lin2log.c \
-						$(MY_OPUS)/silk/control_audio_bandwidth.c \
-						$(MY_OPUS)/silk/NLSF2A.c \
-						$(MY_OPUS)/silk/NSQ.c \
-						$(MY_OPUS)/silk/tables_gain.c \
-						$(MY_OPUS)/silk/dec_API.c \
-						$(MY_OPUS)/silk/table_LSF_cos.c \
-						$(MY_OPUS)/silk/resampler_private_down_FIR.c \
-						$(MY_OPUS)/silk/NLSF_decode.c \
-						$(MY_OPUS)/silk/sum_sqr_shift.c \
-						$(MY_OPUS)/silk/interpolate.c \
-						$(MY_OPUS)/silk/bwexpander.c \
-						$(MY_OPUS)/silk/sigm_Q15.c \
-						$(MY_OPUS)/silk/LPC_inv_pred_gain.c \
-						$(MY_OPUS)/silk/NLSF_unpack.c \
-						$(MY_OPUS)/silk/tables_LTP.c \
-						$(MY_OPUS)/silk/decode_pulses.c \
-						$(MY_OPUS)/silk/inner_prod_aligned.c \
-						$(MY_OPUS)/silk/LP_variable_cutoff.c \
-						$(MY_OPUS)/silk/debug.c \
-						$(MY_OPUS)/silk/stereo_LR_to_MS.c \
-						$(MY_OPUS)/silk/stereo_find_predictor.c \
-						$(MY_OPUS)/silk/process_NLSFs.c \
-						$(MY_OPUS)/silk/tables_NLSF_CB_WB.c \
-						$(MY_OPUS)/silk/NLSF_VQ.c \
-						$(MY_OPUS)/silk/log2lin.c \
-						$(MY_OPUS)/silk/decoder_set_fs.c \
-						$(MY_OPUS)/silk/sort.c \
-						$(MY_OPUS)/silk/HP_variable_cutoff.c \
-						$(MY_OPUS)/silk/NLSF_VQ_weights_laroia.c \
-						$(MY_OPUS)/silk/resampler_private_up2_HQ.c \
-						$(MY_OPUS)/silk/pitch_est_tables.c \
-						$(MY_OPUS)/silk/resampler_private_IIR_FIR.c
-
-
-
-
-LOCAL_SILK_SOURCES_FIXED := $(MY_OPUS)/silk/fixed/LTP_analysis_filter_FIX.c \
-							$(MY_OPUS)/silk/fixed/find_pitch_lags_FIX.c \
-							$(MY_OPUS)/silk/fixed/solve_LS_FIX.c \
-							$(MY_OPUS)/silk/fixed/k2a_FIX.c \
-							$(MY_OPUS)/silk/fixed/regularize_correlations_FIX.c \
-							$(MY_OPUS)/silk/fixed/apply_sine_window_FIX.c \
-							$(MY_OPUS)/silk/fixed/corrMatrix_FIX.c \
-							$(MY_OPUS)/silk/fixed/process_gains_FIX.c \
-							$(MY_OPUS)/silk/fixed/prefilter_FIX.c \
-							$(MY_OPUS)/silk/fixed/autocorr_FIX.c \
-							$(MY_OPUS)/silk/fixed/find_LTP_FIX.c \
-							$(MY_OPUS)/silk/fixed/warped_autocorrelation_FIX.c \
-							$(MY_OPUS)/silk/fixed/schur_FIX.c \
-							$(MY_OPUS)/silk/fixed/burg_modified_FIX.c \
-							$(MY_OPUS)/silk/fixed/noise_shape_analysis_FIX.c \
-							$(MY_OPUS)/silk/fixed/residual_energy_FIX.c \
-							$(MY_OPUS)/silk/fixed/find_LPC_FIX.c \
-							$(MY_OPUS)/silk/fixed/encode_frame_FIX.c \
-							$(MY_OPUS)/silk/fixed/k2a_Q16_FIX.c \
-							$(MY_OPUS)/silk/fixed/LTP_analysis_filter_FIX.c \
-							$(MY_OPUS)/silk/fixed/find_pred_coefs_FIX.c \
-							$(MY_OPUS)/silk/fixed/schur64_FIX.c \
-							$(MY_OPUS)/silk/fixed/pitch_analysis_core_FIX.c \
-							$(MY_OPUS)/silk/fixed/vector_ops_FIX.c \
-							$(MY_OPUS)/silk/fixed/residual_energy16_FIX.c \
-							$(MY_OPUS)/silk/fixed/LTP_scale_ctrl_FIX.c \
-
-
-
-LOCAL_SILK_SOURCES_FLOAT := $(MY_OPUS)/silk/float/apply_sine_window_FLP.c \
-							$(MY_OPUS)/silk/float/inner_product_FLP.c \
-							$(MY_OPUS)/silk/float/warped_autocorrelation_FLP.c \
-							$(MY_OPUS)/silk/float/autocorrelation_FLP.c \
-							$(MY_OPUS)/silk/float/find_pred_coefs_FLP.c \
-							$(MY_OPUS)/silk/float/LPC_analysis_filter_FLP.c \
-							$(MY_OPUS)/silk/float/find_LPC_FLP.c \
-							$(MY_OPUS)/silk/float/scale_copy_vector_FLP.c \
-							$(MY_OPUS)/silk/float/wrappers_FLP.c \
-							$(MY_OPUS)/silk/float/process_gains_FLP.c \
-							$(MY_OPUS)/silk/float/burg_modified_FLP.c \
-							$(MY_OPUS)/silk/float/k2a_FLP.c \
-							$(MY_OPUS)/silk/float/prefilter_FLP.c \
-							$(MY_OPUS)/silk/float/corrMatrix_FLP.c \
-							$(MY_OPUS)/silk/float/LPC_inv_pred_gain_FLP.c \
-							$(MY_OPUS)/silk/float/LTP_scale_ctrl_FLP.c \
-							$(MY_OPUS)/silk/float/pitch_analysis_core_FLP.c \
-							$(MY_OPUS)/silk/float/solve_LS_FLP.c \
-							$(MY_OPUS)/silk/float/energy_FLP.c \
-							$(MY_OPUS)/silk/float/find_pitch_lags_FLP.c \
-							$(MY_OPUS)/silk/float/LTP_analysis_filter_FLP.c \
-							$(MY_OPUS)/silk/float/residual_energy_FLP.c \
-							$(MY_OPUS)/silk/float/regularize_correlations_FLP.c \
-							$(MY_OPUS)/silk/float/bwexpander_FLP.c \
-							$(MY_OPUS)/silk/float/noise_shape_analysis_FLP.c \
-							$(MY_OPUS)/silk/float/encode_frame_FLP.c \
-							$(MY_OPUS)/silk/float/scale_vector_FLP.c \
-							$(MY_OPUS)/silk/float/sort_FLP.c \
-							$(MY_OPUS)/silk/float/find_LTP_FLP.c \
-							$(MY_OPUS)/silk/float/levinsondurbin_FLP.c \
-							$(MY_OPUS)/silk/float/schur_FLP.c \
-
-LOCAL_OPUS_SOURCES := 	$(MY_OPUS)/src/opus.c \
-						$(MY_OPUS)/src/repacketizer_demo.c \
-						$(MY_OPUS)/src/opus_decoder.c \
-						$(MY_OPUS)/src/repacketizer.c \
-						$(MY_OPUS)/src/opus_demo.c \
-						$(MY_OPUS)/src/opus_multistream.c \
-						$(MY_OPUS)/src/opus_encoder.c \
-						$(MY_OPUS)/src/opus_compare.c \
-
-LOCAL_CFLAGS := -DNONTHREADSAFE_PSEUDOSTACK -DOPUS_BUILD
-
-LOCAL_C_INCLUDES := $(MY_OPUS) \
-					$(MY_OPUS)/include \
-					$(MY_OPUS)/celt \
-					$(MY_OPUS)/silk \
-					$(MY_OPUS)/silk/fixed \
-					$(MY_OPUS)/silk/float
-
-LOCAL_SRC_FILES := 	$(LOCAL_OPUS_SOURCES) \
-					$(LOCAL_CELT_SOURCES) \
-					$(LOCAL_SILK_SOURCES) \
-					$(LOCAL_SILK_SOURCES_FIXED) \
-					$(LOCAL_SILK_SOURCES_FLOAT)
-
-LOCAL_EXPORT_C_INCLUDES := $(MY_OPUS)/include
-
-LOCAL_MODULE := libopus
-
-LOCAL_LDLIBS := -llog 
-				
-include $(BUILD_STATIC_LIBRARY)
-
 ############# libcodec_opus ###############
 
 include $(CLEAR_VARS)
@@ -635,106 +355,6 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-############# speex #################
-
-#
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_SRC_FILES := \
-	$(MY_SPEEX)/libspeex/mdf.c \
-	$(MY_SPEEX)/libspeex/preprocess.c \
-	$(MY_SPEEX)/libspeex/filterbank.c \
-	$(MY_SPEEX)/libspeex/fftwrap.c \
-	$(MY_SPEEX)/libspeex/smallft.c \
-	$(MY_SPEEX)/libspeex/bits.c \
-	$(MY_SPEEX)/libspeex/buffer.c \
-	$(MY_SPEEX)/libspeex/cb_search.c \
-	$(MY_SPEEX)/libspeex/exc_10_16_table.c \
-	$(MY_SPEEX)/libspeex/exc_10_32_table.c \
-	$(MY_SPEEX)/libspeex/exc_20_32_table.c \
-	$(MY_SPEEX)/libspeex/exc_5_256_table.c \
-	$(MY_SPEEX)/libspeex/exc_5_64_table.c \
-	$(MY_SPEEX)/libspeex/exc_8_128_table.c \
-	$(MY_SPEEX)/libspeex/filters.c \
-	$(MY_SPEEX)/libspeex/gain_table.c \
-	$(MY_SPEEX)/libspeex/gain_table_lbr.c \
-	$(MY_SPEEX)/libspeex/modes.c \
-	$(MY_SPEEX)/libspeex/modes_wb.c \
-	$(MY_SPEEX)/libspeex/speex.c \
-	$(MY_SPEEX)/libspeex/hexc_10_32_table.c \
-	$(MY_SPEEX)/libspeex/hexc_table.c \
-	$(MY_SPEEX)/libspeex/high_lsp_tables.c \
-	$(MY_SPEEX)/libspeex/jitter.c \
-	$(MY_SPEEX)/libspeex/kiss_fft.c \
-	$(MY_SPEEX)/libspeex/kiss_fftr.c \
-	$(MY_SPEEX)/libspeex/lpc.c \
-	$(MY_SPEEX)/libspeex/lsp.c \
-	$(MY_SPEEX)/libspeex/lsp_tables_nb.c \
-	$(MY_SPEEX)/libspeex/ltp.c \
-	$(MY_SPEEX)/libspeex/nb_celp.c \
-	$(MY_SPEEX)/libspeex/quant_lsp.c \
-	$(MY_SPEEX)/libspeex/sb_celp.c \
-	$(MY_SPEEX)/libspeex/scal.c \
-	$(MY_SPEEX)/libspeex/speex_callbacks.c \
-	$(MY_SPEEX)/libspeex/speex_header.c \
-	$(MY_SPEEX)/libspeex/stereo.c \
-	$(MY_SPEEX)/libspeex/vbr.c \
-	$(MY_SPEEX)/libspeex/vq.c \
-	$(MY_SPEEX)/libspeex/window.c \
-
-
-LOCAL_MODULE:= libspeex
-
-LOCAL_CFLAGS+= -DEXPORT= -DFLOATING_POINT -DUSE_SMALLFT -DVAR_ARRAYS
-LOCAL_CFLAGS+= -O3 -fstrict-aliasing -fprefetch-loop-arrays 
-
-LOCAL_C_INCLUDES += \
-	$(MY_SPEEX)/include
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-############# speexresampler #################
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_SRC_FILES := \
-	$(MY_SPEEX)/libspeex/resample.c
-
-LOCAL_MODULE:= libspeexresampler
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -DEXPORT= -DFIXED_POINT -DRESAMPLE_FORCE_FULL_SINC_TABLE
-LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
-
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
-LOCAL_CFLAGS += -D_USE_NEON
-endif
-
-LOCAL_C_INCLUDES += \
-	$(MY_SPEEX)/include
-
-include $(BUILD_SHARED_LIBRARY)
-
 
 ############# speex_nb ###############
 
@@ -833,1093 +453,3 @@
 				  -DAPP_NAME=\"codecfactory\"
 
 include $(BUILD_SHARED_LIBRARY)
-
-
-################# common cpp ####################
-
-include $(CLEAR_VARS)
-
-LT_VERSION = "0:1"
-LT_RELEASE = "1.8"
-SHARED_FLAGS = "-no-undefined"
-
-LOCAL_COMMONCPP_PATH = commoncpp2-android/src
-
-LOCAL_CPPFLAGS   += -std=c++11 -Wno-psabi -frtti -pthread -fexceptions
-LOCAL_MODULE     := libccgnu2
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib
-
-LOCAL_C_INCLUDES += $(LOCAL_COMMONCPP_PATH)/.. \
-			$(LOCAL_COMMONCPP_PATH)/../inc
-		
-
-LOCAL_SRC_FILES  := $(LOCAL_COMMONCPP_PATH)/thread.cpp \
-		$(LOCAL_COMMONCPP_PATH)/mutex.cpp \
-		$(LOCAL_COMMONCPP_PATH)/semaphore.cpp \
-		$(LOCAL_COMMONCPP_PATH)/threadkey.cpp \
-		$(LOCAL_COMMONCPP_PATH)/friends.cpp \
-		$(LOCAL_COMMONCPP_PATH)/event.cpp \
-		$(LOCAL_COMMONCPP_PATH)/slog.cpp \
-		$(LOCAL_COMMONCPP_PATH)/dir.cpp \
-		$(LOCAL_COMMONCPP_PATH)/file.cpp \
-		$(LOCAL_COMMONCPP_PATH)/inaddr.cpp \
-		$(LOCAL_COMMONCPP_PATH)/peer.cpp \
-		$(LOCAL_COMMONCPP_PATH)/timer.cpp \
-		$(LOCAL_COMMONCPP_PATH)/socket.cpp \
-		$(LOCAL_COMMONCPP_PATH)/strchar.cpp \
-		$(LOCAL_COMMONCPP_PATH)/simplesocket.cpp \
-		$(LOCAL_COMMONCPP_PATH)/mempager.cpp \
-		$(LOCAL_COMMONCPP_PATH)/keydata.cpp \
-		$(LOCAL_COMMONCPP_PATH)/dso.cpp \
-		$(LOCAL_COMMONCPP_PATH)/exception.cpp \
-		$(LOCAL_COMMONCPP_PATH)/missing.cpp \
-		$(LOCAL_COMMONCPP_PATH)/process.cpp \
-		$(LOCAL_COMMONCPP_PATH)/string.cpp \
-		$(LOCAL_COMMONCPP_PATH)/in6addr.cpp \
-		$(LOCAL_COMMONCPP_PATH)/buffer.cpp \
-		$(LOCAL_COMMONCPP_PATH)/lockfile.cpp \
-		$(LOCAL_COMMONCPP_PATH)/nat.cpp \
-		$(LOCAL_COMMONCPP_PATH)/runlist.cpp \
-		$(LOCAL_COMMONCPP_PATH)/assoc.cpp \
-		$(LOCAL_COMMONCPP_PATH)/pointer.cpp \
-		$(LOCAL_COMMONCPP_PATH)/linked.cpp \
-		$(LOCAL_COMMONCPP_PATH)/map.cpp \
-		$(LOCAL_COMMONCPP_PATH)/cidr.cpp
-
-#LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-########## libsamplerate ###################
-
-
-# We need to build this for both the device (as a shared library)
-# and the host (as a static library for tools to use).
-
-# Device shared library
-include $(CLEAR_VARS)
-
-common_SRC_FILES := $(MY_LIBSAMPLE)/src/samplerate.c \
-                    $(MY_LIBSAMPLE)/src/src_sinc.c \
-			$(MY_LIBSAMPLE)/src/src_zoh.c \
-			$(MY_LIBSAMPLE)/src/src_linear.c
-
-
-
-
-LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_CFLAGS += -Werror -g
-LOCAL_LDFLAGS := 
-LOCAL_C_INCLUDES += $(MY_LIBSAMPLE)/
-
-LOCAL_MODULE:= libsamplerate
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-
-################# libexpat ####################
-
-include $(CLEAR_VARS)
-
-# We need to build this for both the device (as a shared library)
-# and the host (as a static library for tools to use).
-
-common_SRC_FILES :=  \
-	libexpat/xmlparse.c \
-	libexpat/xmlrole.c \
-	libexpat/xmltok.c
-
-common_CFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H
-
-common_COPY_HEADERS_TO := libexpat
-common_COPY_HEADERS := libexpat/ \
-	libexpat/lib/expat.h \
-	libexpat/lib/expat_external.h
-
-# For the device
-# =====================================================
-
-# Device static library
-include $(CLEAR_VARS)
-
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 9
-LOCAL_SDK_VERSION := 14
-endif
-
-LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_C_INCLUDES += libexpat
-
-LOCAL_MODULE:= libexpat_static
-LOCAL_MODULE_FILENAME := libexpat
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-
-# Device shared library
-include $(CLEAR_VARS)
-
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 9
-LOCAL_SDK_VERSION := 14
-endif
-
-LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_C_INCLUDES += libexpat
-
-LOCAL_MODULE:= libexpat_shared
-LOCAL_MODULE_FILENAME := libexpat
-LOCAL_MODULE_TAGS := optional
-LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
-LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-
-
-########### ccrtp1 ####################
-
-
-include $(CLEAR_VARS)
-
-LOCAL_CCRTP1_PATH = $(MY_CCRTP)/src
-
-LT_VERSION = 
-LT_RELEASE = 
-SHARED_FLAGS = "-no-undefined"
-SRTP_OPENSSL =
-SRTP_GCRYPT =
-
-#LOCAL_CPPFLAGS   += -Wno-psabi -frtti -pthread -fexceptions
-LOCAL_CPPFLAGS   += -std=c++11 -fexceptions
-LOCAL_C_INCLUDES +=  $(LOCAL_CCRTP1_PATH) \
-					$(MY_COMMONCPP)/inc \
-		    		$(MY_OPENSSL)/include
-
-LOCAL_MODULE     := libccrtp1
-
-LOCAL_SHARED_LIBRARIES += libccgnu2 \
-						  libssl_shared
-
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
-                    -L$(APP_PROJECT_PATH)/obj/local/armeabi-v7a \
-					-llog
-
-LOCAL_SHARED_LIBRARIES := 	libccgnu2 \
-							libssl \
-							libcrypto
-
-LOCAL_CPP_EXTENSION := .cxx .cpp
-
-SRTP_SRC_O = 	$(LOCAL_CCRTP1_PATH)/ccrtp/crypto/openssl/hmac.cpp \
-		$(LOCAL_CCRTP1_PATH)/ccrtp/crypto/openssl/AesSrtp.cxx \
-		$(LOCAL_CCRTP1_PATH)/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
-
-ifneq ($(SRTP_GCRYPT),)
-SRTP_SRC_G =    $(LOCAL_CCRTP1_PATH)/ccrtp/crypto/gcrypt/gcrypthmac.cxx \
-		$(LOCAL_CCRTP1_PATH)/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx \
-		$(LOCAL_CCRTP1_PATH)/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
-endif
-
-SKEIN_SRCS = $(LOCAL_CCRTP1_PATH)/ccrtp/crypto/macSkein.cpp \
-        $(LOCAL_CCRTP1_PATH)/ccrtp/crypto/skein.c \
-        $(LOCAL_CCRTP1_PATH)/ccrtp/crypto/skein_block.c \
-        $(LOCAL_CCRTP1_PATH)/ccrtp/crypto/skeinApi.c
-
-LOCAL_SRC_FILES  := $(LOCAL_CCRTP1_PATH)/rtppkt.cpp \
-			$(LOCAL_CCRTP1_PATH)/rtcppkt.cpp \
-			$(LOCAL_CCRTP1_PATH)/source.cpp \
-			$(LOCAL_CCRTP1_PATH)/data.cpp \
-			$(LOCAL_CCRTP1_PATH)/incqueue.cpp \
-			$(LOCAL_CCRTP1_PATH)/outqueue.cpp \
-			$(LOCAL_CCRTP1_PATH)/queue.cpp \
-			$(LOCAL_CCRTP1_PATH)/control.cpp \
-			$(LOCAL_CCRTP1_PATH)/members.cpp \
-			$(LOCAL_CCRTP1_PATH)/socket.cpp \
-			$(LOCAL_CCRTP1_PATH)/duplex.cpp $(LOCAL_CCRTP1_PATH)/pool.cpp \
-			$(LOCAL_CCRTP1_PATH)/CryptoContext.cxx $(SRTP_SRC_G) $(SRTP_SRC_O) $(SKEIN_SRCS)
-
-
-#LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
-
-include $(BUILD_SHARED_LIBRARY)
-
-############### libpcre ##################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libpcre
-LOCAL_CFLAGS := -DHAVE_CONFIG_H
-
-LOCAL_SRC_FILES :=  \
-  libpcre/pcre_compile.c \
-  libpcre/pcre_chartables.c \
-  libpcre/pcre_config.c \
-  libpcre/pcre_dfa_exec.c \
-  libpcre/pcre_exec.c \
-  libpcre/pcre_fullinfo.c \
-  libpcre/pcre_get.c \
-  libpcre/pcre_globals.c \
-  libpcre/pcre_info.c \
-  libpcre/pcre_maketables.c \
-  libpcre/pcre_newline.c \
-  libpcre/pcre_ord2utf8.c \
-  libpcre/pcre_refcount.c \
-  libpcre/pcre_study.c \
-  libpcre/pcre_tables.c \
-  libpcre/pcre_try_flipped.c \
-  libpcre/pcre_ucd.c \
-  libpcre/pcre_valid_utf8.c \
-  libpcre/pcre_version.c \
-  libpcre/pcre_xclass.c
-
-include $(BUILD_SHARED_LIBRARY)
-
-############### libyaml ##################
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := -DYAML_VERSION_STRING=\"0.1.4\" \
-				-DYAML_VERSION_MAJOR=0 \
-				-DYAML_VERSION_MINOR=1 \
-				-DYAML_VERSION_PATCH=4
-LOCAL_MODULE     := libyaml
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib
-LOCAL_SRC_FILES  := libyaml/api.c libyaml/reader.c libyaml/scanner.c \
-                    libyaml/parser.c libyaml/loader.c libyaml/writer.c libyaml/emitter.c libyaml/dumper.c
-LOCAL_C_INCLUDES += libyaml/inc
-
-include $(BUILD_SHARED_LIBRARY)
-
-############### openssl-apps ###################
-include $(CLEAR_VARS)
-# Copyright 2006 The Android Open Source Project
-
-LOCAL_APP_OPENSSL = openssl/apps
-
-local_src_files:= $(LOCAL_APP_OPENSSL)/app_rand.c \
-	$(LOCAL_APP_OPENSSL)/apps.c \
-	$(LOCAL_APP_OPENSSL)/asn1pars.c \
-	$(LOCAL_APP_OPENSSL)/ca.c \
-	$(LOCAL_APP_OPENSSL)/ciphers.c \
-	$(LOCAL_APP_OPENSSL)/crl.c \
-	$(LOCAL_APP_OPENSSL)/crl2p7.c \
-	$(LOCAL_APP_OPENSSL)/dgst.c \
-	$(LOCAL_APP_OPENSSL)/dh.c \
-	$(LOCAL_APP_OPENSSL)/dhparam.c \
-	$(LOCAL_APP_OPENSSL)/dsa.c \
-	$(LOCAL_APP_OPENSSL)/dsaparam.c \
-	$(LOCAL_APP_OPENSSL)/ecparam.c \
-	$(LOCAL_APP_OPENSSL)/ec.c \
-	$(LOCAL_APP_OPENSSL)/enc.c \
-	$(LOCAL_APP_OPENSSL)/engine.c \
-	$(LOCAL_APP_OPENSSL)/errstr.c \
-	$(LOCAL_APP_OPENSSL)/gendh.c \
-	$(LOCAL_APP_OPENSSL)/gendsa.c \
-	$(LOCAL_APP_OPENSSL)/genpkey.c \
-	$(LOCAL_APP_OPENSSL)/genrsa.c \
-	$(LOCAL_APP_OPENSSL)/nseq.c \
-	$(LOCAL_APP_OPENSSL)/ocsp.c \
-	$(LOCAL_APP_OPENSSL)/openssl.c \
-	$(LOCAL_APP_OPENSSL)/passwd.c \
-	$(LOCAL_APP_OPENSSL)/pkcs12.c \
-	$(LOCAL_APP_OPENSSL)/pkcs7.c \
-	$(LOCAL_APP_OPENSSL)/pkcs8.c \
-	$(LOCAL_APP_OPENSSL)/pkey.c \
-	$(LOCAL_APP_OPENSSL)/pkeyparam.c \
-	$(LOCAL_APP_OPENSSL)/pkeyutl.c \
-	$(LOCAL_APP_OPENSSL)/prime.c \
-	$(LOCAL_APP_OPENSSL)/rand.c \
-	$(LOCAL_APP_OPENSSL)/req.c \
-	$(LOCAL_APP_OPENSSL)/rsa.c \
-	$(LOCAL_APP_OPENSSL)/rsautl.c \
-	$(LOCAL_APP_OPENSSL)/s_cb.c \
-	$(LOCAL_APP_OPENSSL)/s_client.c \
-	$(LOCAL_APP_OPENSSL)/s_server.c \
-	$(LOCAL_APP_OPENSSL)/s_socket.c \
-	$(LOCAL_APP_OPENSSL)/s_time.c \
-	$(LOCAL_APP_OPENSSL)/sess_id.c \
-	$(LOCAL_APP_OPENSSL)/smime.c \
-	$(LOCAL_APP_OPENSSL)/speed.c \
-	$(LOCAL_APP_OPENSSL)/spkac.c \
-	$(LOCAL_APP_OPENSSL)/verify.c \
-	$(LOCAL_APP_OPENSSL)/version.c \
-	$(LOCAL_APP_OPENSSL)/x509.c
-
-LOCAL_SHARED_LIBRARIES := 	libssl \
-							libcrypto
-
-local_c_includes := \
-        $(LOCAL_APP_OPENSSL)/.. \
-        $(LOCAL_APP_OPENSSL)/../include \
-	external/openssl \
-	external/openssl/include
-
-local_cflags := -DMONOLITH
-
-# These flags omit whole features from the commandline "openssl".
-# However, portions of these features are actually turned on.
-local_cflags += -DOPENSSL_NO_DTLS1
-
-include $(CLEAR_VARS)
-LOCAL_MODULE:= openssl
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(local_src_files)
-LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
-LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_CFLAGS := $(local_cflags)
-include $(LOCAL_APP_OPENSSL)/../android-config.mk
-include $(BUILD_EXECUTABLE)
-
-#include $(CLEAR_VARS)
-#LOCAL_MODULE:= openssl
-#LOCAL_MODULE_TAGS := optional
-#LOCAL_SRC_FILES := $(local_src_files)
-#LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
-#LOCAL_C_INCLUDES := $(local_c_includes)
-#LOCAL_CFLAGS := $(local_cflags)
-#include $(LOCAL_PATH)/../android-config.mk
-#include $(BUILD_HOST_EXECUTABLE)
-
-
-
-############ openssl-crypto ###################
-
-include $(CLEAR_VARS)
-
-LOCAL_CRYPTO_OPENSSL = openssl/crypto
-
-arm_cflags := -DOPENSSL_BN_ASM_MONT -DAES_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
-arm_src_files := \
-    $(LOCAL_CRYPTO_OPENSSL)/aes/asm/aes-armv4.s \
-    $(LOCAL_CRYPTO_OPENSSL)/bn/asm/armv4-mont.s \
-    $(LOCAL_CRYPTO_OPENSSL)/sha/asm/sha1-armv4-large.s \
-    $(LOCAL_CRYPTO_OPENSSL)/sha/asm/sha256-armv4.s \
-    $(LOCAL_CRYPTO_OPENSSL)/sha/asm/sha512-armv4.s
-non_arm_src_files := $(LOCAL_CRYPTO_OPENSSL)/aes/aes_core.c
-
-local_src_files := \
-	$(LOCAL_CRYPTO_OPENSSL)/cryptlib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/mem.c \
-	$(LOCAL_CRYPTO_OPENSSL)/mem_clr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/mem_dbg.c \
-	$(LOCAL_CRYPTO_OPENSSL)/cversion.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ex_data.c \
-	$(LOCAL_CRYPTO_OPENSSL)/cpt_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ebcdic.c \
-	$(LOCAL_CRYPTO_OPENSSL)/uid.c \
-	$(LOCAL_CRYPTO_OPENSSL)/o_time.c \
-	$(LOCAL_CRYPTO_OPENSSL)/o_str.c \
-	$(LOCAL_CRYPTO_OPENSSL)/o_dir.c \
-	$(LOCAL_CRYPTO_OPENSSL)/aes/aes_cbc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/aes/aes_cfb.c \
-	$(LOCAL_CRYPTO_OPENSSL)/aes/aes_ctr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/aes/aes_ecb.c \
-	$(LOCAL_CRYPTO_OPENSSL)/aes/aes_misc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/aes/aes_ofb.c \
-	$(LOCAL_CRYPTO_OPENSSL)/aes/aes_wrap.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_bitstr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_bool.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_bytes.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_d2i_fp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_digest.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_dup.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_enum.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_gentm.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_i2d_fp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_int.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_mbstr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_object.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_octet.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_print.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_set.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_sign.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_strex.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_strnid.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_time.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_type.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_utctm.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_utf8.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/a_verify.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/ameth_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/asn1_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/asn1_gen.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/asn1_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/asn1_par.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/asn_mime.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/asn_moid.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/asn_pack.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/bio_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/bio_ndef.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/d2i_pr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/d2i_pu.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/evp_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/f_enum.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/f_int.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/f_string.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/i2d_pr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/i2d_pu.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/n_pkey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/nsseq.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/p5_pbe.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/p5_pbev2.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/p8_pkey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/t_bitst.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/t_crl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/t_pkey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/t_req.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/t_spki.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/t_x509.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/t_x509a.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/tasn_dec.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/tasn_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/tasn_fre.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/tasn_new.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/tasn_prn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/tasn_typ.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/tasn_utl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_algor.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_attrib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_bignum.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_crl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_exten.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_info.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_long.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_name.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_nx509.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_pkey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_pubkey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_req.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_sig.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_spki.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_val.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_x509.c \
-	$(LOCAL_CRYPTO_OPENSSL)/asn1/x_x509a.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bf/bf_cfb64.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bf/bf_ecb.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bf/bf_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bf/bf_ofb64.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bf/bf_skey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/b_dump.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/b_print.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/b_sock.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bf_buff.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bf_nbio.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bf_null.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bio_cb.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bio_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bio_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_acpt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_bio.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_conn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_dgram.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_fd.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_file.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_log.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_mem.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_null.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bio/bss_sock.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_add.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_asm.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_blind.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_const.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_ctx.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_div.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_exp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_exp2.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_gcd.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_gf2m.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_kron.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_mod.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_mont.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_mpi.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_mul.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_nist.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_prime.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_print.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_rand.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_recp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_shift.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_sqr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_sqrt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/bn/bn_word.c \
-	$(LOCAL_CRYPTO_OPENSSL)/buffer/buf_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/buffer/buffer.c \
-	$(LOCAL_CRYPTO_OPENSSL)/comp/c_rle.c \
-	$(LOCAL_CRYPTO_OPENSSL)/comp/c_zlib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/comp/comp_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/comp/comp_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/conf/conf_api.c \
-	$(LOCAL_CRYPTO_OPENSSL)/conf/conf_def.c \
-	$(LOCAL_CRYPTO_OPENSSL)/conf/conf_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/conf/conf_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/conf/conf_mall.c \
-	$(LOCAL_CRYPTO_OPENSSL)/conf/conf_mod.c \
-	$(LOCAL_CRYPTO_OPENSSL)/conf/conf_sap.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/cbc_cksm.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/cbc_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/cfb64ede.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/cfb64enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/cfb_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/des_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/des_old.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/des_old2.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/ecb3_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/ecb_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/ede_cbcm_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/enc_read.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/enc_writ.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/fcrypt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/fcrypt_b.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/ofb64ede.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/ofb64enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/ofb_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/pcbc_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/qud_cksm.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/rand_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/read2pwd.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/rpc_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/set_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/str2key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/des/xcbc_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_ameth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_check.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_depr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_gen.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dh/dh_pmeth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_ameth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_depr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_gen.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_ossl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_pmeth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_prn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_sign.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dsa/dsa_vrf.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dso/dso_dl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dso/dso_dlfcn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dso/dso_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dso/dso_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dso/dso_null.c \
-	$(LOCAL_CRYPTO_OPENSSL)/dso/dso_openssl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec2_mult.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec2_smpl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_ameth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_check.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_curve.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_cvt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_mult.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_pmeth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ec_print.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/eck_prn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ecp_mont.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ecp_nist.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ec/ecp_smpl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdh/ech_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdh/ech_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdh/ech_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdh/ech_ossl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdsa/ecs_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdsa/ecs_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdsa/ecs_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdsa/ecs_ossl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdsa/ecs_sign.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ecdsa/ecs_vrf.c \
-	$(LOCAL_CRYPTO_OPENSSL)/err/err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/err/err_all.c \
-	$(LOCAL_CRYPTO_OPENSSL)/err/err_prn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/bio_b64.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/bio_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/bio_md.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/bio_ok.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/c_all.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/c_allc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/c_alld.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/digest.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_aes.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_bf.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_des.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_des3.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_null.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_old.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_rc2.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_rc4.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_rc5.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/e_xcbc_d.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/encode.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/evp_acnf.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/evp_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/evp_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/evp_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/evp_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/evp_pbe.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/evp_pkey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_dss.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_dss1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_ecdsa.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_md4.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_md5.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_mdc2.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_null.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_ripemd.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_sha1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_sigver.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/m_wp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/names.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p5_crpt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p5_crpt2.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p_dec.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p_open.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p_seal.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p_sign.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/p_verify.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/pmeth_fn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/pmeth_gn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/evp/pmeth_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/hmac/hm_ameth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/hmac/hm_pmeth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/hmac/hmac.c \
-	$(LOCAL_CRYPTO_OPENSSL)/krb5/krb5_asn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/lhash/lh_stats.c \
-	$(LOCAL_CRYPTO_OPENSSL)/lhash/lhash.c \
-	$(LOCAL_CRYPTO_OPENSSL)/md4/md4_dgst.c \
-	$(LOCAL_CRYPTO_OPENSSL)/md4/md4_one.c \
-	$(LOCAL_CRYPTO_OPENSSL)/md5/md5_dgst.c \
-	$(LOCAL_CRYPTO_OPENSSL)/md5/md5_one.c \
-	$(LOCAL_CRYPTO_OPENSSL)/modes/cbc128.c \
-	$(LOCAL_CRYPTO_OPENSSL)/modes/cfb128.c \
-	$(LOCAL_CRYPTO_OPENSSL)/modes/ctr128.c \
-	$(LOCAL_CRYPTO_OPENSSL)/modes/ofb128.c \
-	$(LOCAL_CRYPTO_OPENSSL)/objects/o_names.c \
-	$(LOCAL_CRYPTO_OPENSSL)/objects/obj_dat.c \
-	$(LOCAL_CRYPTO_OPENSSL)/objects/obj_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/objects/obj_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/objects/obj_xref.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_asn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_cl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_ext.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_ht.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_prn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_srv.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ocsp/ocsp_vfy.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_all.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_info.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_oth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_pk8.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_pkey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_seal.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_sign.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_x509.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pem_xaux.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pem/pvkfmt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_add.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_asn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_attr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_crpt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_crt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_decr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_init.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_key.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_kiss.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_mutl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_npas.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_p8d.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_p8e.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/p12_utl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs12/pk12err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs7/pk7_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs7/pk7_attr.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs7/pk7_doit.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs7/pk7_lib.c	\
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs7/pk7_mime.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs7/pk7_smime.c \
-	$(LOCAL_CRYPTO_OPENSSL)/pkcs7/pkcs7err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rand/md_rand.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rand/rand_egd.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rand/rand_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rand/rand_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rand/rand_unix.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rand/randfile.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rc2/rc2_cbc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rc2/rc2_ecb.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rc2/rc2_skey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rc2/rc2cfb64.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rc2/rc2ofb64.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rc4/rc4_enc.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rc4/rc4_skey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ripemd/rmd_dgst.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ripemd/rmd_one.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_ameth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_asn1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_chk.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_eay.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_gen.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_none.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_null.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_oaep.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_pk1.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_pmeth.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_prn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_pss.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_saos.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_sign.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_ssl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/rsa/rsa_x931.c \
-	$(LOCAL_CRYPTO_OPENSSL)/sha/sha1_one.c \
-	$(LOCAL_CRYPTO_OPENSSL)/sha/sha1dgst.c \
-	$(LOCAL_CRYPTO_OPENSSL)/sha/sha256.c \
-	$(LOCAL_CRYPTO_OPENSSL)/sha/sha512.c \
-	$(LOCAL_CRYPTO_OPENSSL)/sha/sha_dgst.c \
-	$(LOCAL_CRYPTO_OPENSSL)/stack/stack.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ts/ts_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/txt_db/txt_db.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ui/ui_compat.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ui/ui_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ui/ui_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ui/ui_openssl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/ui/ui_util.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/by_dir.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/by_file.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_att.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_cmp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_d2.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_def.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_err.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_ext.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_lu.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_obj.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_r2x.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_req.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_set.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_trs.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_txt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_v3.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_vfy.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509_vpm.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509cset.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509name.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509rset.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509spki.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x509type.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509/x_all.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/pcy_cache.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/pcy_data.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/pcy_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/pcy_map.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/pcy_node.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/pcy_tree.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_akey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_akeya.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_alt.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_bcons.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_bitst.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_conf.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_cpols.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_crld.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_enum.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_extku.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_genn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_ia5.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_info.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_int.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_lib.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_ncons.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_ocsp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_pci.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_pcia.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_pcons.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_pku.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_pmaps.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_prn.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_purp.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_skey.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_sxnet.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3_utl.c \
-	$(LOCAL_CRYPTO_OPENSSL)/x509v3/v3err.c
-
-local_c_includes := $(LOCAL_CRYPTO_OPENSSL)/.. \
-$(LOCAL_CRYPTO_OPENSSL) \
-        $(LOCAL_CRYPTO_OPENSSL)/asn1 \
-	$(LOCAL_CRYPTO_OPENSSL)/evp \
-	$(LOCAL_CRYPTO_OPENSSL)/../include \
-	$(LOCAL_CRYPTO_OPENSSL)/../include/openssl \
-	external/openssl \
-	external/openssl/crypto/asn1 \
-	external/openssl/crypto/evp \
-	external/openssl/include \
-	external/openssl/include/openssl \
-	external/zlib
-
-local_c_flags := -DNO_WINDOWS_BRAINDEATH
-
-#######################################
-# target static library
-include $(CLEAR_VARS)
-include $(LOCAL_CRYPTO_OPENSSL)/../android-config.mk
-
-ifneq ($(TARGET_ARCH),x86)
-LOCAL_NDK_VERSION := 9
-LOCAL_SDK_VERSION := 14
-endif
-
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_CFLAGS += $(local_c_flags)
-LOCAL_C_INCLUDES += $(local_c_includes)
-ifeq ($(TARGET_ARCH),arm)
-	LOCAL_SRC_FILES += $(arm_src_files)
-	LOCAL_CFLAGS += $(arm_cflags)
-else
-	LOCAL_SRC_FILES += $(non_arm_src_files)
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libcrypto_static
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################
-# target shared library
-include $(CLEAR_VARS)
-include $(LOCAL_CRYPTO_OPENSSL)/../android-config.mk
-
-ifneq ($(TARGET_ARCH),x86)
-LOCAL_NDK_VERSION := 9
-LOCAL_SDK_VERSION := 14
-# Use the NDK prebuilt libz and libdl.
-LOCAL_LDFLAGS += -lz -ldl
-else
-LOCAL_SHARED_LIBRARIES += libz libdl
-endif
-
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_CFLAGS += $(local_c_flags)
-LOCAL_C_INCLUDES += $(local_c_includes)
-ifeq ($(TARGET_ARCH),arm)
-	LOCAL_SRC_FILES += $(arm_src_files)
-	LOCAL_CFLAGS += $(arm_cflags)
-else
-	LOCAL_SRC_FILES += $(non_arm_src_files)
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libcrypto
-include $(BUILD_SHARED_LIBRARY)
-
-#######################################
-# host shared library
-#include $(CLEAR_VARS)
-#include $(LOCAL_PATH)/../android-config.mk
-#LOCAL_SRC_FILES += $(local_src_files)
-#LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
-#LOCAL_C_INCLUDES += $(local_c_includes)
-#LOCAL_SRC_FILES += $(non_arm_src_files)
-#LOCAL_STATIC_LIBRARIES += libz
-#LOCAL_LDLIBS += -ldl
-#LOCAL_MODULE_TAGS := optional
-#LOCAL_MODULE:= libcrypto
-#include $(BUILD_HOST_SHARED_LIBRARY)
-
-########################################
-# host static library, which is used by some SDK tools.
-#
-#include $(CLEAR_VARS)
-#include $(LOCAL_PATH)/../android-config.mk
-#LOCAL_SRC_FILES += $(local_src_files)
-#LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
-#LOCAL_C_INCLUDES += $(local_c_includes)
-#LOCAL_SRC_FILES += $(non_arm_src_files)
-#LOCAL_STATIC_LIBRARIES += libz
-#LOCAL_LDLIBS += -ldl
-#LOCAL_MODULE_TAGS := optional
-#LOCAL_MODULE:= libcrypto_static
-#include $(BUILD_HOST_STATIC_LIBRARY)
-
-
-
-############# libzrtp ##################
-
-#
-# Define and build the zrtpcpp static lib
-#
-include $(CLEAR_VARS)
-LOCAL_MODULE := libzrtpcpp
-LOCAL_CPP_FEATURES := exceptions
-#
-# set to false if testing/compiling new modules to catch undefined symbols (if build shared lib without TIVI_ENV)
-# LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
-
-# include paths for zrtpcpp modules
-LOCAL_C_INCLUDES += $(MY_LIBZRTPCPP) \
-					$(MY_LIBZRTPCPP)/srtp \
-					$(MY_LIBZRTPCPP)/src \
-					/ucommon/inc/ \
-					$(APP_PROJECT_PATH)/jni/ucommon/inc \
-					$(MY_LIBZRTPCPP)/src/libzrtpcpp \
-					$(MY_OPENSSL)/include \
-
-LOCAL_SRC_FILES += \
-					$(MY_LIBZRTPCPP)/src/ZrtpCallbackWrapper.cpp \
-					$(MY_LIBZRTPCPP)/src/Zrtp.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpCrc32.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketCommit.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketConf2Ack.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketConfirm.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketDHPart.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketGoClear.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketClearAck.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketHelloAck.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketHello.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketError.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketErrorAck.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketPingAck.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketPing.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketSASrelay.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpPacketRelayAck.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpStateClass.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpTextData.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpConfigure.cpp \
-					$(MY_LIBZRTPCPP)/src/ZrtpCWrapper.cpp \
-					$(MY_LIBZRTPCPP)/src/Base32.cpp \
-					$(MY_LIBZRTPCPP)/srtp/CryptoContext.cpp \
-					$(MY_LIBZRTPCPP)/srtp/CryptoContextCtrl.cpp \
-					$(MY_LIBZRTPCPP)/srtp/crypto/openssl/hmac.cpp \
-					$(MY_LIBZRTPCPP)/srtp/crypto/openssl/SrtpSymCrypto.cpp \
-					$(MY_LIBZRTPCPP)/srtp/crypto/skein_block.c \
-					$(MY_LIBZRTPCPP)/srtp/crypto/macSkein.cpp \
-					$(MY_LIBZRTPCPP)/srtp/crypto/skein.c \
-
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-############# libssl ##################
-
-include $(CLEAR_VARS)
-LOCAL_SSL_PATH = openssl/ssl
-
-local_c_includes := \
-	$(LOCAL_SSL_PATH)/..\
-	$(LOCAL_SSL_PATH)/../include \
-	$(LOCAL_SSL_PATH)/../crypto \
-	external/openssl \
-	external/openssl/include \
-	external/openssl/crypto
-
-local_src_files:= \
-	$(LOCAL_SSL_PATH)/s2_meth.c \
-	$(LOCAL_SSL_PATH)/s2_srvr.c \
-	$(LOCAL_SSL_PATH)/s2_clnt.c \
-	$(LOCAL_SSL_PATH)/s2_lib.c \
-	$(LOCAL_SSL_PATH)/s2_enc.c \
-	$(LOCAL_SSL_PATH)/s2_pkt.c \
-	$(LOCAL_SSL_PATH)/s3_meth.c \
-	$(LOCAL_SSL_PATH)/s3_srvr.c \
-	$(LOCAL_SSL_PATH)/s3_clnt.c \
-	$(LOCAL_SSL_PATH)/s3_lib.c \
-	$(LOCAL_SSL_PATH)/s3_enc.c \
-	$(LOCAL_SSL_PATH)/s3_pkt.c \
-	$(LOCAL_SSL_PATH)/s3_both.c \
-	$(LOCAL_SSL_PATH)/s23_meth.c \
-	$(LOCAL_SSL_PATH)/s23_srvr.c \
-	$(LOCAL_SSL_PATH)/s23_clnt.c \
-	$(LOCAL_SSL_PATH)/s23_lib.c \
-	$(LOCAL_SSL_PATH)/s23_pkt.c \
-	$(LOCAL_SSL_PATH)/t1_meth.c \
-	$(LOCAL_SSL_PATH)/t1_srvr.c \
-	$(LOCAL_SSL_PATH)/t1_clnt.c \
-	$(LOCAL_SSL_PATH)/t1_lib.c \
-	$(LOCAL_SSL_PATH)/t1_enc.c \
-	$(LOCAL_SSL_PATH)/t1_reneg.c \
-	$(LOCAL_SSL_PATH)/ssl_lib.c \
-	$(LOCAL_SSL_PATH)/ssl_err2.c \
-	$(LOCAL_SSL_PATH)/ssl_cert.c \
-	$(LOCAL_SSL_PATH)/ssl_sess.c \
-	$(LOCAL_SSL_PATH)/ssl_ciph.c \
-	$(LOCAL_SSL_PATH)/ssl_stat.c \
-	$(LOCAL_SSL_PATH)/ssl_rsa.c \
-	$(LOCAL_SSL_PATH)/ssl_asn1.c \
-	$(LOCAL_SSL_PATH)/ssl_txt.c \
-	$(LOCAL_SSL_PATH)/ssl_algs.c \
-	$(LOCAL_SSL_PATH)/bio_ssl.c \
-	$(LOCAL_SSL_PATH)/ssl_err.c \
-	$(LOCAL_SSL_PATH)/kssl.c
-
-#######################################
-# target static library
-include $(CLEAR_VARS)
-include $(LOCAL_SSL_PATH)/../android-config.mk
-
-ifneq ($(TARGET_ARCH),x86)
-LOCAL_NDK_VERSION := 9
-LOCAL_SDK_VERSION := 14
-endif
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl_static
-include $(BUILD_STATIC_LIBRARY)
-
-#######################################
-# target shared library
-include $(CLEAR_VARS)
-include $(LOCAL_SSL_PATH)/../android-config.mk
-
-ifneq ($(TARGET_ARCH),x86)
-LOCAL_NDK_VERSION := 9
-LOCAL_SDK_VERSION := 14
-endif
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES += libcrypto
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl_shared
-LOCAL_MODULE_FILENAME := libssl
-include $(BUILD_SHARED_LIBRARY)
-
-#######################################
-# host shared library
-include $(CLEAR_VARS)
-include $(LOCAL_SSL_PATH)/../android-config.mk
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES += libcrypto
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-#######################################
-# ssltest
-include $(CLEAR_VARS)
-include $(LOCAL_SSL_PATH)/../android-config.mk
-LOCAL_SRC_FILES:= ssltest.c
-LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := libssl libcrypto
-LOCAL_MODULE:= ssltest
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_EXECUTABLE)
-
-
-
diff --git a/jni/Application.mk b/jni/Application.mk
index 51a2899..8ba0b55 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -5,19 +5,19 @@
 APP_STL := gnustl_shared
 APP_ABI := armeabi-v7a
 
-APP_MODULE += libopus
+#APP_MODULE += libopus
 APP_MODULES += libccgnu2
 APP_MODULES += libsamplerate
 
 #APP_MODULES += libexpat_static
 #APP_MODULES += libexpat_shared
 APP_MODULES += libccrtp1
-APP_MODULES += libsndfile
+#APP_MODULES += libsndfile
 
 
 APP_MODULES += libpcre
 
-APP_MODULES += libcrypto
+# APP_MODULES += libcrypto
 #APP_MODULES += libzrtpcpp
 
 APP_MODULES += libspeexresampler
diff --git a/jni/ccrtp-android/Android.mk b/jni/ccrtp-android/Android.mk
deleted file mode 100644
index 1d4ec7f..0000000
--- a/jni/ccrtp-android/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
\ No newline at end of file
diff --git a/jni/ccrtp-android/INSTALL b/jni/ccrtp-android/INSTALL
deleted file mode 100644
index b42a17a..0000000
--- a/jni/ccrtp-android/INSTALL
+++ /dev/null
@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/jni/ccrtp-android/doc/fdl.texi b/jni/ccrtp-android/doc/fdl.texi
deleted file mode 100644
index 5385f32..0000000
--- a/jni/ccrtp-android/doc/fdl.texi
+++ /dev/null
@@ -1,452 +0,0 @@
-
-@node GNU Free Documentation License
-@appendixsec GNU Free Documentation License
-
-@cindex FDL, GNU Free Documentation License
-@center Version 1.2, November 2002
-
-@display
-Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@enumerate 0
-@item
-PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document @dfn{free} in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of ``copyleft'', which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-@item
-APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The ``Document'', below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as ``you''.  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A ``Modified Version'' of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A ``Secondary Section'' is a named appendix or a front-matter section
-of the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject.  (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The ``Invariant Sections'' are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The ``Cover Texts'' are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A ``Transparent'' copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not ``Transparent'' is called ``Opaque''.
-
-Examples of suitable formats for Transparent copies include plain
-@sc{ascii} without markup, Texinfo input format, La@TeX{} input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML},
-PostScript or @acronym{PDF} designed for human modification.  Examples
-of transparent image formats include @acronym{PNG}, @acronym{XCF} and
-@acronym{JPG}.  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
-@acronym{XML} for which the @acronym{DTD} and/or processing tools are
-not generally available, and the machine-generated @acronym{HTML},
-PostScript or @acronym{PDF} produced by some word processors for
-output purposes only.
-
-The ``Title Page'' means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, ``Title Page'' means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section ``Entitled XYZ'' means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as ``Acknowledgements'',
-``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
-of such a section when you modify the Document means that it remains a
-section ``Entitled XYZ'' according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-@item
-VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-@item
-COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-@item
-MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-@enumerate A
-@item
-Use in the Title Page (and on the covers, if any) a title distinct
-from that of the Document, and from those of previous versions
-(which should, if there were any, be listed in the History section
-of the Document).  You may use the same title as a previous version
-if the original publisher of that version gives permission.
-
-@item
-List on the Title Page, as authors, one or more persons or entities
-responsible for authorship of the modifications in the Modified
-Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has fewer than five),
-unless they release you from this requirement.
-
-@item
-State on the Title page the name of the publisher of the
-Modified Version, as the publisher.
-
-@item
-Preserve all the copyright notices of the Document.
-
-@item
-Add an appropriate copyright notice for your modifications
-adjacent to the other copyright notices.
-
-@item
-Include, immediately after the copyright notices, a license notice
-giving the public permission to use the Modified Version under the
-terms of this License, in the form shown in the Addendum below.
-
-@item
-Preserve in that license notice the full lists of Invariant Sections
-and required Cover Texts given in the Document's license notice.
-
-@item
-Include an unaltered copy of this License.
-
-@item
-Preserve the section Entitled ``History'', Preserve its Title, and add
-to it an item stating at least the title, year, new authors, and
-publisher of the Modified Version as given on the Title Page.  If
-there is no section Entitled ``History'' in the Document, create one
-stating the title, year, authors, and publisher of the Document as
-given on its Title Page, then add an item describing the Modified
-Version as stated in the previous sentence.
-
-@item
-Preserve the network location, if any, given in the Document for
-public access to a Transparent copy of the Document, and likewise
-the network locations given in the Document for previous versions
-it was based on.  These may be placed in the ``History'' section.
-You may omit a network location for a work that was published at
-least four years before the Document itself, or if the original
-publisher of the version it refers to gives permission.
-
-@item
-For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
-the Title of the section, and preserve in the section all the
-substance and tone of each of the contributor acknowledgements and/or
-dedications given therein.
-
-@item
-Preserve all the Invariant Sections of the Document,
-unaltered in their text and in their titles.  Section numbers
-or the equivalent are not considered part of the section titles.
-
-@item
-Delete any section Entitled ``Endorsements''.  Such a section
-may not be included in the Modified Version.
-
-@item
-Do not retitle any existing section to be Entitled ``Endorsements'' or
-to conflict in title with any Invariant Section.
-
-@item
-Preserve any Warranty Disclaimers.
-@end enumerate
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled ``Endorsements'', provided it contains
-nothing but endorsements of your Modified Version by various
-parties---for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-@item
-COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled ``History''
-in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
-and any sections Entitled ``Dedications''.  You must delete all
-sections Entitled ``Endorsements.''
-
-@item
-COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-@item
-AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an ``aggregate'' if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-@item
-TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warrany Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-@item
-TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-@item
-FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-@uref{http://www.gnu.org/copyleft/}.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-@end enumerate
-
-@page
-@appendixsubsec ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-@smallexample
-@group
-  Copyright (C)  @var{year}  @var{your name}.
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.2
-  or any later version published by the Free Software Foundation;
-  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-  A copy of the license is included in the section entitled ``GNU
-  Free Documentation License''.
-@end group
-@end smallexample
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with...Texts.'' line with this:
-
-@smallexample
-@group
-    with the Invariant Sections being @var{list their titles}, with
-    the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
-    being @var{list}.
-@end group
-@end smallexample
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-
-@c Local Variables:
-@c ispell-local-pdict: "ispell-dict"
-@c End:
-
diff --git a/jni/ccrtp-android/doc/fdlnotice.texi b/jni/ccrtp-android/doc/fdlnotice.texi
deleted file mode 100644
index d667a36..0000000
--- a/jni/ccrtp-android/doc/fdlnotice.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 
-or any later version published by the Free Software Foundation; 
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License".
diff --git a/jni/ccrtp-android/doc/gpl.texi b/jni/ccrtp-android/doc/gpl.texi
deleted file mode 100644
index d26233c..0000000
--- a/jni/ccrtp-android/doc/gpl.texi
+++ /dev/null
@@ -1,392 +0,0 @@
-@node GNU General Public License
-@appendixsec GNU GENERAL PUBLIC LICENSE
-@center Version 2, June 1991
-
-@c This file is intended to be included in another file.
-
-@display
-Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-
-@appendixsubsec Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software---to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-@iftex
-@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end iftex
-@ifinfo
-@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-@end ifinfo
-
-@enumerate 0
-@item
-This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The ``Program'', below,
-refers to any such program or work, and a ``work based on the Program''
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term ``modification''.)  Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-@item
-You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-@item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-@enumerate a
-@item
-You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-@item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
-
-@item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
-@end enumerate
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-@item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-@enumerate a
-@item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
-
-@item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-
-@item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
-@end enumerate
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-@item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-@item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-@item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-@item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-@item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-@item
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-@item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-@iftex
-@heading NO WARRANTY
-@end iftex
-@ifinfo
-@center NO WARRANTY
-@end ifinfo
-
-@item
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-@item
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-@end enumerate
-
-@iftex
-@heading END OF TERMS AND CONDITIONS
-@end iftex
-@ifinfo
-@center END OF TERMS AND CONDITIONS
-@end ifinfo
-
-@page
-@appendixsubsec Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-
-@smallexample
-@var{one line to give the program's name and a brief idea of what it does.}
-Copyright (C) @var{yyyy}  @var{name of author}
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-@end smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-@smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
-Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type `show c' for details.
-@end smallexample
-
-The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than @samp{show w} and
-@samp{show c}; they could even be mouse-clicks or menu items---whatever
-suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the program, if
-necessary.  Here is a sample; alter the names:
-
-@example
-Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-`Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-@var{signature of Ty Coon}, 1 April 1989
-Ty Coon, President of Vice
-@end example
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/jni/ccrtp-android/m4/libtool.m4 b/jni/ccrtp-android/m4/libtool.m4
deleted file mode 100644
index 8ff3c76..0000000
--- a/jni/ccrtp-android/m4/libtool.m4
+++ /dev/null
@@ -1,7851 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*) ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd[[12]]*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/jni/ccrtp-android/m4/ltoptions.m4 b/jni/ccrtp-android/m4/ltoptions.m4
deleted file mode 100644
index 17cfd51..0000000
--- a/jni/ccrtp-android/m4/ltoptions.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/jni/ccrtp-android/m4/ltsugar.m4 b/jni/ccrtp-android/m4/ltsugar.m4
deleted file mode 100644
index 9000a05..0000000
--- a/jni/ccrtp-android/m4/ltsugar.m4
+++ /dev/null
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff --git a/jni/ccrtp-android/m4/ltversion.m4 b/jni/ccrtp-android/m4/ltversion.m4
deleted file mode 100644
index 9c7b5d4..0000000
--- a/jni/ccrtp-android/m4/ltversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3293 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff --git a/jni/ccrtp-android/m4/lt~obsolete.m4 b/jni/ccrtp-android/m4/lt~obsolete.m4
deleted file mode 100644
index c573da9..0000000
--- a/jni/ccrtp-android/m4/lt~obsolete.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/jni/ccrtp-android/src/Android.mk b/jni/ccrtp-android/src/Android.mk
deleted file mode 100644
index 3e7e093..0000000
--- a/jni/ccrtp-android/src/Android.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-MY_LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-LOCAL_PATH := $(MY_LOCAL_PATH)
-
-include $(CLEAR_VARS)
-
-LT_VERSION = 
-LT_RELEASE = 
-SHARED_FLAGS = "-no-undefined"
-SRTP_OPENSSL =
-SRTP_GCRYPT =
-
-#LOCAL_CPPFLAGS   += -Wno-psabi -frtti -pthread -fexceptions
-LOCAL_CPPFLAGS   += -std=gnu++0x -fexceptions
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../commoncpp2-1.8.1-android/inc \
-		    $(LOCAL_PATH)/../../openssl/include
-LOCAL_MODULE     := libccrtp1
-LOCAL_SHARED_LIBRARIES += libccgnu2 \
-						  libssl_shared
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
-                    -L$(APP_PROJECT_PATH)/obj/local/armeabi \
-                    -lccgnu2 \
-		    -lssl \
-		    -lcrypto
-LOCAL_CPP_EXTENSION := .cxx .cpp
-
-SRTP_SRC_O = 	ccrtp/crypto/openssl/hmac.cpp \
-				ccrtp/crypto/openssl/AesSrtp.cxx \
-				ccrtp/crypto/openssl/InitializeOpenSSL.cxx
-
-ifneq ($(SRTP_GCRYPT),)
-SRTP_SRC_G =    ccrtp/crypto/gcrypt/gcrypthmac.cxx \
-				ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx \
-				ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
-endif
-
-SKEIN_SRCS = ccrtp/crypto/macSkein.cpp \
-        ccrtp/crypto/skein.c \
-        ccrtp/crypto/skein_block.c \
-        ccrtp/crypto/skeinApi.c
-
-LOCAL_SRC_FILES  := rtppkt.cpp rtcppkt.cpp source.cpp data.cpp incqueue.cpp \
-	outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \
-	CryptoContext.cxx $(SRTP_SRC_G) $(SRTP_SRC_O) $(SKEIN_SRCS)
-
-
-#LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/ccrtp-android/src/stamp-h1 b/jni/ccrtp-android/src/stamp-h1
deleted file mode 100644
index 57ea58e..0000000
--- a/jni/ccrtp-android/src/stamp-h1
+++ /dev/null
@@ -1 +0,0 @@
-timestamp for src/config.h
diff --git a/jni/commoncpp2-android/Android.mk b/jni/commoncpp2-android/Android.mk
index 1d4ec7f..d0d568d 100644
--- a/jni/commoncpp2-android/Android.mk
+++ b/jni/commoncpp2-android/Android.mk
@@ -1 +1,55 @@
-include $(call all-subdir-makefiles)
\ No newline at end of file
+include $(CLEAR_VARS)
+
+LT_VERSION = "0:1"
+LT_RELEASE = "1.8"
+SHARED_FLAGS = "-no-undefined"
+
+LOCAL_COMMONCPP_PATH = commoncpp2-android/sources/src
+
+LOCAL_CPPFLAGS   += -std=c++11 -Wno-psabi -frtti -pthread -fexceptions
+
+LOCAL_MODULE     := libccgnu2
+
+LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib
+
+LOCAL_C_INCLUDES += $(LOCAL_COMMONCPP_PATH) \
+			$(LOCAL_COMMONCPP_PATH)/../inc
+		
+
+LOCAL_SRC_FILES  := $(LOCAL_COMMONCPP_PATH)/thread.cpp \
+		$(LOCAL_COMMONCPP_PATH)/mutex.cpp \
+		$(LOCAL_COMMONCPP_PATH)/semaphore.cpp \
+		$(LOCAL_COMMONCPP_PATH)/threadkey.cpp \
+		$(LOCAL_COMMONCPP_PATH)/friends.cpp \
+		$(LOCAL_COMMONCPP_PATH)/event.cpp \
+		$(LOCAL_COMMONCPP_PATH)/slog.cpp \
+		$(LOCAL_COMMONCPP_PATH)/dir.cpp \
+		$(LOCAL_COMMONCPP_PATH)/file.cpp \
+		$(LOCAL_COMMONCPP_PATH)/inaddr.cpp \
+		$(LOCAL_COMMONCPP_PATH)/peer.cpp \
+		$(LOCAL_COMMONCPP_PATH)/timer.cpp \
+		$(LOCAL_COMMONCPP_PATH)/socket.cpp \
+		$(LOCAL_COMMONCPP_PATH)/strchar.cpp \
+		$(LOCAL_COMMONCPP_PATH)/simplesocket.cpp \
+		$(LOCAL_COMMONCPP_PATH)/mempager.cpp \
+		$(LOCAL_COMMONCPP_PATH)/keydata.cpp \
+		$(LOCAL_COMMONCPP_PATH)/dso.cpp \
+		$(LOCAL_COMMONCPP_PATH)/exception.cpp \
+		$(LOCAL_COMMONCPP_PATH)/missing.cpp \
+		$(LOCAL_COMMONCPP_PATH)/process.cpp \
+		$(LOCAL_COMMONCPP_PATH)/string.cpp \
+		$(LOCAL_COMMONCPP_PATH)/in6addr.cpp \
+		$(LOCAL_COMMONCPP_PATH)/buffer.cpp \
+		$(LOCAL_COMMONCPP_PATH)/lockfile.cpp \
+		$(LOCAL_COMMONCPP_PATH)/nat.cpp \
+		$(LOCAL_COMMONCPP_PATH)/runlist.cpp \
+		$(LOCAL_COMMONCPP_PATH)/assoc.cpp \
+		$(LOCAL_COMMONCPP_PATH)/pointer.cpp \
+		$(LOCAL_COMMONCPP_PATH)/linked.cpp \
+		$(LOCAL_COMMONCPP_PATH)/map.cpp \
+		$(LOCAL_COMMONCPP_PATH)/cidr.cpp
+
+#LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/jni/commoncpp2-android/0003-android-adapt-commoncpp.patch b/jni/commoncpp2-android/sources/0003-android-adapt-commoncpp.patch
similarity index 100%
rename from jni/commoncpp2-android/0003-android-adapt-commoncpp.patch
rename to jni/commoncpp2-android/sources/0003-android-adapt-commoncpp.patch
diff --git a/jni/commoncpp2-android/AUTHORS b/jni/commoncpp2-android/sources/AUTHORS
similarity index 100%
rename from jni/commoncpp2-android/AUTHORS
rename to jni/commoncpp2-android/sources/AUTHORS
diff --git a/jni/commoncpp2-android/COPYING b/jni/commoncpp2-android/sources/COPYING
similarity index 100%
rename from jni/commoncpp2-android/COPYING
rename to jni/commoncpp2-android/sources/COPYING
diff --git a/jni/commoncpp2-android/COPYING.addendum b/jni/commoncpp2-android/sources/COPYING.addendum
similarity index 100%
rename from jni/commoncpp2-android/COPYING.addendum
rename to jni/commoncpp2-android/sources/COPYING.addendum
diff --git a/jni/commoncpp2-android/ChangeLog b/jni/commoncpp2-android/sources/ChangeLog
similarity index 100%
rename from jni/commoncpp2-android/ChangeLog
rename to jni/commoncpp2-android/sources/ChangeLog
diff --git a/jni/commoncpp2-android/INSTALL b/jni/commoncpp2-android/sources/INSTALL
similarity index 100%
rename from jni/commoncpp2-android/INSTALL
rename to jni/commoncpp2-android/sources/INSTALL
diff --git a/jni/commoncpp2-android/INSTALL.w32 b/jni/commoncpp2-android/sources/INSTALL.w32
similarity index 100%
rename from jni/commoncpp2-android/INSTALL.w32
rename to jni/commoncpp2-android/sources/INSTALL.w32
diff --git a/jni/commoncpp2-android/Makefile b/jni/commoncpp2-android/sources/Makefile
similarity index 100%
rename from jni/commoncpp2-android/Makefile
rename to jni/commoncpp2-android/sources/Makefile
diff --git a/jni/commoncpp2-android/Makefile.am b/jni/commoncpp2-android/sources/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/Makefile.am
rename to jni/commoncpp2-android/sources/Makefile.am
diff --git a/jni/commoncpp2-android/Makefile.in b/jni/commoncpp2-android/sources/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/Makefile.in
rename to jni/commoncpp2-android/sources/Makefile.in
diff --git a/jni/commoncpp2-android/NEWS b/jni/commoncpp2-android/sources/NEWS
similarity index 100%
rename from jni/commoncpp2-android/NEWS
rename to jni/commoncpp2-android/sources/NEWS
diff --git a/jni/commoncpp2-android/README b/jni/commoncpp2-android/sources/README
similarity index 100%
rename from jni/commoncpp2-android/README
rename to jni/commoncpp2-android/sources/README
diff --git a/jni/commoncpp2-android/SUPPORT b/jni/commoncpp2-android/sources/SUPPORT
similarity index 100%
rename from jni/commoncpp2-android/SUPPORT
rename to jni/commoncpp2-android/sources/SUPPORT
diff --git a/jni/commoncpp2-android/THANKS b/jni/commoncpp2-android/sources/THANKS
similarity index 100%
rename from jni/commoncpp2-android/THANKS
rename to jni/commoncpp2-android/sources/THANKS
diff --git a/jni/commoncpp2-android/TODO b/jni/commoncpp2-android/sources/TODO
similarity index 100%
rename from jni/commoncpp2-android/TODO
rename to jni/commoncpp2-android/sources/TODO
diff --git a/jni/commoncpp2-android/aclocal.m4 b/jni/commoncpp2-android/sources/aclocal.m4
similarity index 100%
rename from jni/commoncpp2-android/aclocal.m4
rename to jni/commoncpp2-android/sources/aclocal.m4
diff --git a/jni/commoncpp2-android/autoconf/config.guess b/jni/commoncpp2-android/sources/autoconf/config.guess
similarity index 100%
rename from jni/commoncpp2-android/autoconf/config.guess
rename to jni/commoncpp2-android/sources/autoconf/config.guess
diff --git a/jni/commoncpp2-android/autoconf/config.sub b/jni/commoncpp2-android/sources/autoconf/config.sub
similarity index 100%
rename from jni/commoncpp2-android/autoconf/config.sub
rename to jni/commoncpp2-android/sources/autoconf/config.sub
diff --git a/jni/commoncpp2-android/autoconf/depcomp b/jni/commoncpp2-android/sources/autoconf/depcomp
similarity index 100%
rename from jni/commoncpp2-android/autoconf/depcomp
rename to jni/commoncpp2-android/sources/autoconf/depcomp
diff --git a/jni/commoncpp2-android/autoconf/install-sh b/jni/commoncpp2-android/sources/autoconf/install-sh
similarity index 100%
rename from jni/commoncpp2-android/autoconf/install-sh
rename to jni/commoncpp2-android/sources/autoconf/install-sh
diff --git a/jni/commoncpp2-android/autoconf/ltmain.sh b/jni/commoncpp2-android/sources/autoconf/ltmain.sh
similarity index 100%
rename from jni/commoncpp2-android/autoconf/ltmain.sh
rename to jni/commoncpp2-android/sources/autoconf/ltmain.sh
diff --git a/jni/commoncpp2-android/autoconf/missing b/jni/commoncpp2-android/sources/autoconf/missing
similarity index 100%
rename from jni/commoncpp2-android/autoconf/missing
rename to jni/commoncpp2-android/sources/autoconf/missing
diff --git a/jni/commoncpp2-android/autoconf/texinfo.tex b/jni/commoncpp2-android/sources/autoconf/texinfo.tex
similarity index 100%
rename from jni/commoncpp2-android/autoconf/texinfo.tex
rename to jni/commoncpp2-android/sources/autoconf/texinfo.tex
diff --git a/jni/commoncpp2-android/autogen.sh b/jni/commoncpp2-android/sources/autogen.sh
similarity index 100%
rename from jni/commoncpp2-android/autogen.sh
rename to jni/commoncpp2-android/sources/autogen.sh
diff --git a/jni/commoncpp2-android/autom4te.cache/output.0 b/jni/commoncpp2-android/sources/autom4te.cache/output.0
similarity index 100%
rename from jni/commoncpp2-android/autom4te.cache/output.0
rename to jni/commoncpp2-android/sources/autom4te.cache/output.0
diff --git a/jni/commoncpp2-android/autom4te.cache/output.1 b/jni/commoncpp2-android/sources/autom4te.cache/output.1
similarity index 100%
rename from jni/commoncpp2-android/autom4te.cache/output.1
rename to jni/commoncpp2-android/sources/autom4te.cache/output.1
diff --git a/jni/commoncpp2-android/autom4te.cache/requests b/jni/commoncpp2-android/sources/autom4te.cache/requests
similarity index 100%
rename from jni/commoncpp2-android/autom4te.cache/requests
rename to jni/commoncpp2-android/sources/autom4te.cache/requests
diff --git a/jni/commoncpp2-android/autom4te.cache/traces.0 b/jni/commoncpp2-android/sources/autom4te.cache/traces.0
similarity index 100%
rename from jni/commoncpp2-android/autom4te.cache/traces.0
rename to jni/commoncpp2-android/sources/autom4te.cache/traces.0
diff --git a/jni/commoncpp2-android/autom4te.cache/traces.1 b/jni/commoncpp2-android/sources/autom4te.cache/traces.1
similarity index 100%
rename from jni/commoncpp2-android/autom4te.cache/traces.1
rename to jni/commoncpp2-android/sources/autom4te.cache/traces.1
diff --git a/jni/commoncpp2-android/commoncpp2.list b/jni/commoncpp2-android/sources/commoncpp2.list
similarity index 100%
rename from jni/commoncpp2-android/commoncpp2.list
rename to jni/commoncpp2-android/sources/commoncpp2.list
diff --git a/jni/commoncpp2-android/commoncpp2.list.in b/jni/commoncpp2-android/sources/commoncpp2.list.in
similarity index 100%
rename from jni/commoncpp2-android/commoncpp2.list.in
rename to jni/commoncpp2-android/sources/commoncpp2.list.in
diff --git a/jni/commoncpp2-android/commoncpp2.lsm.in b/jni/commoncpp2-android/sources/commoncpp2.lsm.in
similarity index 100%
rename from jni/commoncpp2-android/commoncpp2.lsm.in
rename to jni/commoncpp2-android/sources/commoncpp2.lsm.in
diff --git a/jni/commoncpp2-android/commoncpp2.spec b/jni/commoncpp2-android/sources/commoncpp2.spec
similarity index 100%
rename from jni/commoncpp2-android/commoncpp2.spec
rename to jni/commoncpp2-android/sources/commoncpp2.spec
diff --git a/jni/commoncpp2-android/commoncpp2.spec.in b/jni/commoncpp2-android/sources/commoncpp2.spec.in
similarity index 100%
rename from jni/commoncpp2-android/commoncpp2.spec.in
rename to jni/commoncpp2-android/sources/commoncpp2.spec.in
diff --git a/jni/commoncpp2-android/config.h b/jni/commoncpp2-android/sources/config.h
similarity index 100%
rename from jni/commoncpp2-android/config.h
rename to jni/commoncpp2-android/sources/config.h
diff --git a/jni/commoncpp2-android/config.h.android b/jni/commoncpp2-android/sources/config.h.android
similarity index 100%
rename from jni/commoncpp2-android/config.h.android
rename to jni/commoncpp2-android/sources/config.h.android
diff --git a/jni/commoncpp2-android/config.h.in b/jni/commoncpp2-android/sources/config.h.in
similarity index 100%
rename from jni/commoncpp2-android/config.h.in
rename to jni/commoncpp2-android/sources/config.h.in
diff --git a/jni/commoncpp2-android/config.log b/jni/commoncpp2-android/sources/config.log
similarity index 100%
rename from jni/commoncpp2-android/config.log
rename to jni/commoncpp2-android/sources/config.log
diff --git a/jni/commoncpp2-android/config.status b/jni/commoncpp2-android/sources/config.status
similarity index 100%
rename from jni/commoncpp2-android/config.status
rename to jni/commoncpp2-android/sources/config.status
diff --git a/jni/commoncpp2-android/configure b/jni/commoncpp2-android/sources/configure
similarity index 100%
rename from jni/commoncpp2-android/configure
rename to jni/commoncpp2-android/sources/configure
diff --git a/jni/commoncpp2-android/configure.ac b/jni/commoncpp2-android/sources/configure.ac
similarity index 100%
rename from jni/commoncpp2-android/configure.ac
rename to jni/commoncpp2-android/sources/configure.ac
diff --git a/jni/commoncpp2-android/demo/.deps/SampleSocketPort.Po b/jni/commoncpp2-android/sources/demo/.deps/SampleSocketPort.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/SampleSocketPort.Po
rename to jni/commoncpp2-android/sources/demo/.deps/SampleSocketPort.Po
diff --git a/jni/commoncpp2-android/demo/.deps/buffer.Po b/jni/commoncpp2-android/sources/demo/.deps/buffer.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/buffer.Po
rename to jni/commoncpp2-android/sources/demo/.deps/buffer.Po
diff --git a/jni/commoncpp2-android/demo/.deps/cmdlineopt.Po b/jni/commoncpp2-android/sources/demo/.deps/cmdlineopt.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/cmdlineopt.Po
rename to jni/commoncpp2-android/sources/demo/.deps/cmdlineopt.Po
diff --git a/jni/commoncpp2-android/demo/.deps/crc32.Po b/jni/commoncpp2-android/sources/demo/.deps/crc32.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/crc32.Po
rename to jni/commoncpp2-android/sources/demo/.deps/crc32.Po
diff --git a/jni/commoncpp2-android/demo/.deps/dccpclient.Po b/jni/commoncpp2-android/sources/demo/.deps/dccpclient.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/dccpclient.Po
rename to jni/commoncpp2-android/sources/demo/.deps/dccpclient.Po
diff --git a/jni/commoncpp2-android/demo/.deps/dccpserver.Po b/jni/commoncpp2-android/sources/demo/.deps/dccpserver.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/dccpserver.Po
rename to jni/commoncpp2-android/sources/demo/.deps/dccpserver.Po
diff --git a/jni/commoncpp2-android/demo/.deps/dir.Po b/jni/commoncpp2-android/sources/demo/.deps/dir.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/dir.Po
rename to jni/commoncpp2-android/sources/demo/.deps/dir.Po
diff --git a/jni/commoncpp2-android/demo/.deps/keydump.Po b/jni/commoncpp2-android/sources/demo/.deps/keydump.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/keydump.Po
rename to jni/commoncpp2-android/sources/demo/.deps/keydump.Po
diff --git a/jni/commoncpp2-android/demo/.deps/netdevices.Po b/jni/commoncpp2-android/sources/demo/.deps/netdevices.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/netdevices.Po
rename to jni/commoncpp2-android/sources/demo/.deps/netdevices.Po
diff --git a/jni/commoncpp2-android/demo/.deps/serialecho.Po b/jni/commoncpp2-android/sources/demo/.deps/serialecho.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/serialecho.Po
rename to jni/commoncpp2-android/sources/demo/.deps/serialecho.Po
diff --git a/jni/commoncpp2-android/demo/.deps/serialmain.Po b/jni/commoncpp2-android/sources/demo/.deps/serialmain.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/serialmain.Po
rename to jni/commoncpp2-android/sources/demo/.deps/serialmain.Po
diff --git a/jni/commoncpp2-android/demo/.deps/slogTest.Po b/jni/commoncpp2-android/sources/demo/.deps/slogTest.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/slogTest.Po
rename to jni/commoncpp2-android/sources/demo/.deps/slogTest.Po
diff --git a/jni/commoncpp2-android/demo/.deps/str.Po b/jni/commoncpp2-android/sources/demo/.deps/str.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/str.Po
rename to jni/commoncpp2-android/sources/demo/.deps/str.Po
diff --git a/jni/commoncpp2-android/demo/.deps/tcp.Po b/jni/commoncpp2-android/sources/demo/.deps/tcp.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/tcp.Po
rename to jni/commoncpp2-android/sources/demo/.deps/tcp.Po
diff --git a/jni/commoncpp2-android/demo/.deps/tcpservice.Po b/jni/commoncpp2-android/sources/demo/.deps/tcpservice.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/tcpservice.Po
rename to jni/commoncpp2-android/sources/demo/.deps/tcpservice.Po
diff --git a/jni/commoncpp2-android/demo/.deps/tcpthread.Po b/jni/commoncpp2-android/sources/demo/.deps/tcpthread.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/tcpthread.Po
rename to jni/commoncpp2-android/sources/demo/.deps/tcpthread.Po
diff --git a/jni/commoncpp2-android/demo/.deps/test_alog.Po b/jni/commoncpp2-android/sources/demo/.deps/test_alog.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/test_alog.Po
rename to jni/commoncpp2-android/sources/demo/.deps/test_alog.Po
diff --git a/jni/commoncpp2-android/demo/.deps/timer.Po b/jni/commoncpp2-android/sources/demo/.deps/timer.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/timer.Po
rename to jni/commoncpp2-android/sources/demo/.deps/timer.Po
diff --git a/jni/commoncpp2-android/demo/.deps/urlfetch.Po b/jni/commoncpp2-android/sources/demo/.deps/urlfetch.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/urlfetch.Po
rename to jni/commoncpp2-android/sources/demo/.deps/urlfetch.Po
diff --git a/jni/commoncpp2-android/demo/.deps/xmlfetch.Po b/jni/commoncpp2-android/sources/demo/.deps/xmlfetch.Po
similarity index 100%
rename from jni/commoncpp2-android/demo/.deps/xmlfetch.Po
rename to jni/commoncpp2-android/sources/demo/.deps/xmlfetch.Po
diff --git a/jni/commoncpp2-android/demo/Makefile b/jni/commoncpp2-android/sources/demo/Makefile
similarity index 100%
rename from jni/commoncpp2-android/demo/Makefile
rename to jni/commoncpp2-android/sources/demo/Makefile
diff --git a/jni/commoncpp2-android/demo/Makefile.am b/jni/commoncpp2-android/sources/demo/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/demo/Makefile.am
rename to jni/commoncpp2-android/sources/demo/Makefile.am
diff --git a/jni/commoncpp2-android/demo/Makefile.bcc b/jni/commoncpp2-android/sources/demo/Makefile.bcc
similarity index 100%
rename from jni/commoncpp2-android/demo/Makefile.bcc
rename to jni/commoncpp2-android/sources/demo/Makefile.bcc
diff --git a/jni/commoncpp2-android/demo/Makefile.in b/jni/commoncpp2-android/sources/demo/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/demo/Makefile.in
rename to jni/commoncpp2-android/sources/demo/Makefile.in
diff --git a/jni/commoncpp2-android/demo/README b/jni/commoncpp2-android/sources/demo/README
similarity index 100%
rename from jni/commoncpp2-android/demo/README
rename to jni/commoncpp2-android/sources/demo/README
diff --git a/jni/commoncpp2-android/demo/SampleSocketPort.cpp b/jni/commoncpp2-android/sources/demo/SampleSocketPort.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/SampleSocketPort.cpp
rename to jni/commoncpp2-android/sources/demo/SampleSocketPort.cpp
diff --git a/jni/commoncpp2-android/demo/SampleSocketPort.h b/jni/commoncpp2-android/sources/demo/SampleSocketPort.h
similarity index 100%
rename from jni/commoncpp2-android/demo/SampleSocketPort.h
rename to jni/commoncpp2-android/sources/demo/SampleSocketPort.h
diff --git a/jni/commoncpp2-android/demo/buffer.cpp b/jni/commoncpp2-android/sources/demo/buffer.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/buffer.cpp
rename to jni/commoncpp2-android/sources/demo/buffer.cpp
diff --git a/jni/commoncpp2-android/demo/cmdlineopt.cpp b/jni/commoncpp2-android/sources/demo/cmdlineopt.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/cmdlineopt.cpp
rename to jni/commoncpp2-android/sources/demo/cmdlineopt.cpp
diff --git a/jni/commoncpp2-android/demo/crc32.cpp b/jni/commoncpp2-android/sources/demo/crc32.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/crc32.cpp
rename to jni/commoncpp2-android/sources/demo/crc32.cpp
diff --git a/jni/commoncpp2-android/demo/dccpclient.cpp b/jni/commoncpp2-android/sources/demo/dccpclient.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/dccpclient.cpp
rename to jni/commoncpp2-android/sources/demo/dccpclient.cpp
diff --git a/jni/commoncpp2-android/demo/dccpserver.cpp b/jni/commoncpp2-android/sources/demo/dccpserver.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/dccpserver.cpp
rename to jni/commoncpp2-android/sources/demo/dccpserver.cpp
diff --git a/jni/commoncpp2-android/demo/dir.cpp b/jni/commoncpp2-android/sources/demo/dir.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/dir.cpp
rename to jni/commoncpp2-android/sources/demo/dir.cpp
diff --git a/jni/commoncpp2-android/demo/keydump.cpp b/jni/commoncpp2-android/sources/demo/keydump.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/keydump.cpp
rename to jni/commoncpp2-android/sources/demo/keydump.cpp
diff --git a/jni/commoncpp2-android/demo/netdevices.cpp b/jni/commoncpp2-android/sources/demo/netdevices.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/netdevices.cpp
rename to jni/commoncpp2-android/sources/demo/netdevices.cpp
diff --git a/jni/commoncpp2-android/demo/serialecho.cpp b/jni/commoncpp2-android/sources/demo/serialecho.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/serialecho.cpp
rename to jni/commoncpp2-android/sources/demo/serialecho.cpp
diff --git a/jni/commoncpp2-android/demo/serialecho.h b/jni/commoncpp2-android/sources/demo/serialecho.h
similarity index 100%
rename from jni/commoncpp2-android/demo/serialecho.h
rename to jni/commoncpp2-android/sources/demo/serialecho.h
diff --git a/jni/commoncpp2-android/demo/serialmain.cpp b/jni/commoncpp2-android/sources/demo/serialmain.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/serialmain.cpp
rename to jni/commoncpp2-android/sources/demo/serialmain.cpp
diff --git a/jni/commoncpp2-android/demo/slogTest.cpp b/jni/commoncpp2-android/sources/demo/slogTest.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/slogTest.cpp
rename to jni/commoncpp2-android/sources/demo/slogTest.cpp
diff --git a/jni/commoncpp2-android/demo/str.cpp b/jni/commoncpp2-android/sources/demo/str.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/str.cpp
rename to jni/commoncpp2-android/sources/demo/str.cpp
diff --git a/jni/commoncpp2-android/demo/tcp.cpp b/jni/commoncpp2-android/sources/demo/tcp.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/tcp.cpp
rename to jni/commoncpp2-android/sources/demo/tcp.cpp
diff --git a/jni/commoncpp2-android/demo/tcpservice.cpp b/jni/commoncpp2-android/sources/demo/tcpservice.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/tcpservice.cpp
rename to jni/commoncpp2-android/sources/demo/tcpservice.cpp
diff --git a/jni/commoncpp2-android/demo/tcpthread.cpp b/jni/commoncpp2-android/sources/demo/tcpthread.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/tcpthread.cpp
rename to jni/commoncpp2-android/sources/demo/tcpthread.cpp
diff --git a/jni/commoncpp2-android/demo/test.xml b/jni/commoncpp2-android/sources/demo/test.xml
similarity index 100%
rename from jni/commoncpp2-android/demo/test.xml
rename to jni/commoncpp2-android/sources/demo/test.xml
diff --git a/jni/commoncpp2-android/demo/test_alog.cpp b/jni/commoncpp2-android/sources/demo/test_alog.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/test_alog.cpp
rename to jni/commoncpp2-android/sources/demo/test_alog.cpp
diff --git a/jni/commoncpp2-android/demo/timer.cpp b/jni/commoncpp2-android/sources/demo/timer.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/timer.cpp
rename to jni/commoncpp2-android/sources/demo/timer.cpp
diff --git a/jni/commoncpp2-android/demo/urlfetch.cpp b/jni/commoncpp2-android/sources/demo/urlfetch.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/urlfetch.cpp
rename to jni/commoncpp2-android/sources/demo/urlfetch.cpp
diff --git a/jni/commoncpp2-android/demo/xmlfetch.cpp b/jni/commoncpp2-android/sources/demo/xmlfetch.cpp
similarity index 100%
rename from jni/commoncpp2-android/demo/xmlfetch.cpp
rename to jni/commoncpp2-android/sources/demo/xmlfetch.cpp
diff --git a/jni/commoncpp2-android/doc/Doxyfile b/jni/commoncpp2-android/sources/doc/Doxyfile
similarity index 100%
rename from jni/commoncpp2-android/doc/Doxyfile
rename to jni/commoncpp2-android/sources/doc/Doxyfile
diff --git a/jni/commoncpp2-android/doc/Doxyfile.in b/jni/commoncpp2-android/sources/doc/Doxyfile.in
similarity index 100%
rename from jni/commoncpp2-android/doc/Doxyfile.in
rename to jni/commoncpp2-android/sources/doc/Doxyfile.in
diff --git a/jni/commoncpp2-android/doc/Makefile b/jni/commoncpp2-android/sources/doc/Makefile
similarity index 100%
rename from jni/commoncpp2-android/doc/Makefile
rename to jni/commoncpp2-android/sources/doc/Makefile
diff --git a/jni/commoncpp2-android/doc/Makefile.am b/jni/commoncpp2-android/sources/doc/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/doc/Makefile.am
rename to jni/commoncpp2-android/sources/doc/Makefile.am
diff --git a/jni/commoncpp2-android/doc/Makefile.in b/jni/commoncpp2-android/sources/doc/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/doc/Makefile.in
rename to jni/commoncpp2-android/sources/doc/Makefile.in
diff --git a/jni/commoncpp2-android/doc/commoncpp2.info b/jni/commoncpp2-android/sources/doc/commoncpp2.info
similarity index 100%
rename from jni/commoncpp2-android/doc/commoncpp2.info
rename to jni/commoncpp2-android/sources/doc/commoncpp2.info
Binary files differ
diff --git a/jni/commoncpp2-android/doc/commoncpp2.texi b/jni/commoncpp2-android/sources/doc/commoncpp2.texi
similarity index 100%
rename from jni/commoncpp2-android/doc/commoncpp2.texi
rename to jni/commoncpp2-android/sources/doc/commoncpp2.texi
diff --git a/jni/commoncpp2-android/doc/fdl.texi b/jni/commoncpp2-android/sources/doc/fdl.texi
similarity index 100%
rename from jni/commoncpp2-android/doc/fdl.texi
rename to jni/commoncpp2-android/sources/doc/fdl.texi
diff --git a/jni/commoncpp2-android/doc/fdlnotice.texi b/jni/commoncpp2-android/sources/doc/fdlnotice.texi
similarity index 100%
rename from jni/commoncpp2-android/doc/fdlnotice.texi
rename to jni/commoncpp2-android/sources/doc/fdlnotice.texi
diff --git a/jni/commoncpp2-android/doc/gpl.texi b/jni/commoncpp2-android/sources/doc/gpl.texi
similarity index 100%
rename from jni/commoncpp2-android/doc/gpl.texi
rename to jni/commoncpp2-android/sources/doc/gpl.texi
diff --git a/jni/commoncpp2-android/envsetup.sh b/jni/commoncpp2-android/sources/envsetup.sh
similarity index 100%
rename from jni/commoncpp2-android/envsetup.sh
rename to jni/commoncpp2-android/sources/envsetup.sh
diff --git a/jni/commoncpp2-android/inc/Makefile b/jni/commoncpp2-android/sources/inc/Makefile
similarity index 100%
rename from jni/commoncpp2-android/inc/Makefile
rename to jni/commoncpp2-android/sources/inc/Makefile
diff --git a/jni/commoncpp2-android/inc/Makefile.am b/jni/commoncpp2-android/sources/inc/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/inc/Makefile.am
rename to jni/commoncpp2-android/sources/inc/Makefile.am
diff --git a/jni/commoncpp2-android/inc/Makefile.in b/jni/commoncpp2-android/sources/inc/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/inc/Makefile.in
rename to jni/commoncpp2-android/sources/inc/Makefile.in
diff --git a/jni/commoncpp2-android/inc/cc++/Makefile b/jni/commoncpp2-android/sources/inc/cc++/Makefile
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/Makefile
rename to jni/commoncpp2-android/sources/inc/cc++/Makefile
diff --git a/jni/commoncpp2-android/inc/cc++/Makefile.am b/jni/commoncpp2-android/sources/inc/cc++/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/Makefile.am
rename to jni/commoncpp2-android/sources/inc/cc++/Makefile.am
diff --git a/jni/commoncpp2-android/inc/cc++/Makefile.in b/jni/commoncpp2-android/sources/inc/cc++/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/Makefile.in
rename to jni/commoncpp2-android/sources/inc/cc++/Makefile.in
diff --git a/jni/commoncpp2-android/inc/cc++/address.h b/jni/commoncpp2-android/sources/inc/cc++/address.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/address.h
rename to jni/commoncpp2-android/sources/inc/cc++/address.h
diff --git a/jni/commoncpp2-android/inc/cc++/applog.h b/jni/commoncpp2-android/sources/inc/cc++/applog.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/applog.h
rename to jni/commoncpp2-android/sources/inc/cc++/applog.h
diff --git a/jni/commoncpp2-android/inc/cc++/buffer.h b/jni/commoncpp2-android/sources/inc/cc++/buffer.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/buffer.h
rename to jni/commoncpp2-android/sources/inc/cc++/buffer.h
diff --git a/jni/commoncpp2-android/inc/cc++/cmdoptns.h b/jni/commoncpp2-android/sources/inc/cc++/cmdoptns.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/cmdoptns.h
rename to jni/commoncpp2-android/sources/inc/cc++/cmdoptns.h
diff --git a/jni/commoncpp2-android/inc/cc++/common.h b/jni/commoncpp2-android/sources/inc/cc++/common.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/common.h
rename to jni/commoncpp2-android/sources/inc/cc++/common.h
diff --git a/jni/commoncpp2-android/inc/cc++/config.h b/jni/commoncpp2-android/sources/inc/cc++/config.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/config.h
rename to jni/commoncpp2-android/sources/inc/cc++/config.h
diff --git a/jni/commoncpp2-android/inc/cc++/config.h.android b/jni/commoncpp2-android/sources/inc/cc++/config.h.android
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/config.h.android
rename to jni/commoncpp2-android/sources/inc/cc++/config.h.android
diff --git a/jni/commoncpp2-android/inc/cc++/counter.h b/jni/commoncpp2-android/sources/inc/cc++/counter.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/counter.h
rename to jni/commoncpp2-android/sources/inc/cc++/counter.h
diff --git a/jni/commoncpp2-android/inc/cc++/digest.h b/jni/commoncpp2-android/sources/inc/cc++/digest.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/digest.h
rename to jni/commoncpp2-android/sources/inc/cc++/digest.h
diff --git a/jni/commoncpp2-android/inc/cc++/exception.h b/jni/commoncpp2-android/sources/inc/cc++/exception.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/exception.h
rename to jni/commoncpp2-android/sources/inc/cc++/exception.h
diff --git a/jni/commoncpp2-android/inc/cc++/export.h b/jni/commoncpp2-android/sources/inc/cc++/export.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/export.h
rename to jni/commoncpp2-android/sources/inc/cc++/export.h
diff --git a/jni/commoncpp2-android/inc/cc++/file.h b/jni/commoncpp2-android/sources/inc/cc++/file.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/file.h
rename to jni/commoncpp2-android/sources/inc/cc++/file.h
diff --git a/jni/commoncpp2-android/inc/cc++/functions.h b/jni/commoncpp2-android/sources/inc/cc++/functions.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/functions.h
rename to jni/commoncpp2-android/sources/inc/cc++/functions.h
diff --git a/jni/commoncpp2-android/inc/cc++/mime.h b/jni/commoncpp2-android/sources/inc/cc++/mime.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/mime.h
rename to jni/commoncpp2-android/sources/inc/cc++/mime.h
diff --git a/jni/commoncpp2-android/inc/cc++/misc.h b/jni/commoncpp2-android/sources/inc/cc++/misc.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/misc.h
rename to jni/commoncpp2-android/sources/inc/cc++/misc.h
diff --git a/jni/commoncpp2-android/inc/cc++/missing.h b/jni/commoncpp2-android/sources/inc/cc++/missing.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/missing.h
rename to jni/commoncpp2-android/sources/inc/cc++/missing.h
diff --git a/jni/commoncpp2-android/inc/cc++/network.h b/jni/commoncpp2-android/sources/inc/cc++/network.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/network.h
rename to jni/commoncpp2-android/sources/inc/cc++/network.h
diff --git a/jni/commoncpp2-android/inc/cc++/numbers.h b/jni/commoncpp2-android/sources/inc/cc++/numbers.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/numbers.h
rename to jni/commoncpp2-android/sources/inc/cc++/numbers.h
diff --git a/jni/commoncpp2-android/inc/cc++/objcount.h b/jni/commoncpp2-android/sources/inc/cc++/objcount.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/objcount.h
rename to jni/commoncpp2-android/sources/inc/cc++/objcount.h
diff --git a/jni/commoncpp2-android/inc/cc++/object.h b/jni/commoncpp2-android/sources/inc/cc++/object.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/object.h
rename to jni/commoncpp2-android/sources/inc/cc++/object.h
diff --git a/jni/commoncpp2-android/inc/cc++/objlink.h b/jni/commoncpp2-android/sources/inc/cc++/objlink.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/objlink.h
rename to jni/commoncpp2-android/sources/inc/cc++/objlink.h
diff --git a/jni/commoncpp2-android/inc/cc++/objmap.h b/jni/commoncpp2-android/sources/inc/cc++/objmap.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/objmap.h
rename to jni/commoncpp2-android/sources/inc/cc++/objmap.h
diff --git a/jni/commoncpp2-android/inc/cc++/objsync.h b/jni/commoncpp2-android/sources/inc/cc++/objsync.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/objsync.h
rename to jni/commoncpp2-android/sources/inc/cc++/objsync.h
diff --git a/jni/commoncpp2-android/inc/cc++/oststring.h b/jni/commoncpp2-android/sources/inc/cc++/oststring.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/oststring.h
rename to jni/commoncpp2-android/sources/inc/cc++/oststring.h
diff --git a/jni/commoncpp2-android/inc/cc++/persist.h b/jni/commoncpp2-android/sources/inc/cc++/persist.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/persist.h
rename to jni/commoncpp2-android/sources/inc/cc++/persist.h
diff --git a/jni/commoncpp2-android/inc/cc++/pointer.h b/jni/commoncpp2-android/sources/inc/cc++/pointer.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/pointer.h
rename to jni/commoncpp2-android/sources/inc/cc++/pointer.h
diff --git a/jni/commoncpp2-android/inc/cc++/process.h b/jni/commoncpp2-android/sources/inc/cc++/process.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/process.h
rename to jni/commoncpp2-android/sources/inc/cc++/process.h
diff --git a/jni/commoncpp2-android/inc/cc++/serial.h b/jni/commoncpp2-android/sources/inc/cc++/serial.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/serial.h
rename to jni/commoncpp2-android/sources/inc/cc++/serial.h
diff --git a/jni/commoncpp2-android/inc/cc++/slog.h b/jni/commoncpp2-android/sources/inc/cc++/slog.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/slog.h
rename to jni/commoncpp2-android/sources/inc/cc++/slog.h
diff --git a/jni/commoncpp2-android/inc/cc++/socket.h b/jni/commoncpp2-android/sources/inc/cc++/socket.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/socket.h
rename to jni/commoncpp2-android/sources/inc/cc++/socket.h
diff --git a/jni/commoncpp2-android/inc/cc++/socketport.h b/jni/commoncpp2-android/sources/inc/cc++/socketport.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/socketport.h
rename to jni/commoncpp2-android/sources/inc/cc++/socketport.h
diff --git a/jni/commoncpp2-android/inc/cc++/ssl.h b/jni/commoncpp2-android/sources/inc/cc++/ssl.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/ssl.h
rename to jni/commoncpp2-android/sources/inc/cc++/ssl.h
diff --git a/jni/commoncpp2-android/inc/cc++/strchar.h b/jni/commoncpp2-android/sources/inc/cc++/strchar.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/strchar.h
rename to jni/commoncpp2-android/sources/inc/cc++/strchar.h
diff --git a/jni/commoncpp2-android/inc/cc++/string.h b/jni/commoncpp2-android/sources/inc/cc++/string.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/string.h
rename to jni/commoncpp2-android/sources/inc/cc++/string.h
diff --git a/jni/commoncpp2-android/inc/cc++/template.h b/jni/commoncpp2-android/sources/inc/cc++/template.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/template.h
rename to jni/commoncpp2-android/sources/inc/cc++/template.h
diff --git a/jni/commoncpp2-android/inc/cc++/thread.h b/jni/commoncpp2-android/sources/inc/cc++/thread.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/thread.h
rename to jni/commoncpp2-android/sources/inc/cc++/thread.h
diff --git a/jni/commoncpp2-android/inc/cc++/tokenizer.h b/jni/commoncpp2-android/sources/inc/cc++/tokenizer.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/tokenizer.h
rename to jni/commoncpp2-android/sources/inc/cc++/tokenizer.h
diff --git a/jni/commoncpp2-android/inc/cc++/unix.h b/jni/commoncpp2-android/sources/inc/cc++/unix.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/unix.h
rename to jni/commoncpp2-android/sources/inc/cc++/unix.h
diff --git a/jni/commoncpp2-android/inc/cc++/url.h b/jni/commoncpp2-android/sources/inc/cc++/url.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/url.h
rename to jni/commoncpp2-android/sources/inc/cc++/url.h
diff --git a/jni/commoncpp2-android/inc/cc++/xml.h b/jni/commoncpp2-android/sources/inc/cc++/xml.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/xml.h
rename to jni/commoncpp2-android/sources/inc/cc++/xml.h
diff --git a/jni/commoncpp2-android/inc/cc++/zstream.h b/jni/commoncpp2-android/sources/inc/cc++/zstream.h
similarity index 100%
rename from jni/commoncpp2-android/inc/cc++/zstream.h
rename to jni/commoncpp2-android/sources/inc/cc++/zstream.h
diff --git a/jni/commoncpp2-android/inc/config.tmp b/jni/commoncpp2-android/sources/inc/config.tmp
similarity index 100%
rename from jni/commoncpp2-android/inc/config.tmp
rename to jni/commoncpp2-android/sources/inc/config.tmp
diff --git a/jni/commoncpp2-android/libtool b/jni/commoncpp2-android/sources/libtool
similarity index 100%
rename from jni/commoncpp2-android/libtool
rename to jni/commoncpp2-android/sources/libtool
diff --git a/jni/commoncpp2-android/m4/Makefile b/jni/commoncpp2-android/sources/m4/Makefile
similarity index 100%
rename from jni/commoncpp2-android/m4/Makefile
rename to jni/commoncpp2-android/sources/m4/Makefile
diff --git a/jni/commoncpp2-android/m4/Makefile.am b/jni/commoncpp2-android/sources/m4/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/m4/Makefile.am
rename to jni/commoncpp2-android/sources/m4/Makefile.am
diff --git a/jni/commoncpp2-android/m4/Makefile.in b/jni/commoncpp2-android/sources/m4/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/m4/Makefile.in
rename to jni/commoncpp2-android/sources/m4/Makefile.in
diff --git a/jni/commoncpp2-android/m4/libtool.m4 b/jni/commoncpp2-android/sources/m4/libtool.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/libtool.m4
rename to jni/commoncpp2-android/sources/m4/libtool.m4
diff --git a/jni/commoncpp2-android/m4/ltoptions.m4 b/jni/commoncpp2-android/sources/m4/ltoptions.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ltoptions.m4
rename to jni/commoncpp2-android/sources/m4/ltoptions.m4
diff --git a/jni/commoncpp2-android/m4/ltsugar.m4 b/jni/commoncpp2-android/sources/m4/ltsugar.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ltsugar.m4
rename to jni/commoncpp2-android/sources/m4/ltsugar.m4
diff --git a/jni/commoncpp2-android/m4/ltversion.m4 b/jni/commoncpp2-android/sources/m4/ltversion.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ltversion.m4
rename to jni/commoncpp2-android/sources/m4/ltversion.m4
diff --git a/jni/commoncpp2-android/m4/lt~obsolete.m4 b/jni/commoncpp2-android/sources/m4/lt~obsolete.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/lt~obsolete.m4
rename to jni/commoncpp2-android/sources/m4/lt~obsolete.m4
diff --git a/jni/commoncpp2-android/m4/ost_cxx.m4 b/jni/commoncpp2-android/sources/m4/ost_cxx.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_cxx.m4
rename to jni/commoncpp2-android/sources/m4/ost_cxx.m4
diff --git a/jni/commoncpp2-android/m4/ost_debug.m4 b/jni/commoncpp2-android/sources/m4/ost_debug.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_debug.m4
rename to jni/commoncpp2-android/sources/m4/ost_debug.m4
diff --git a/jni/commoncpp2-android/m4/ost_dynamic.m4 b/jni/commoncpp2-android/sources/m4/ost_dynamic.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_dynamic.m4
rename to jni/commoncpp2-android/sources/m4/ost_dynamic.m4
diff --git a/jni/commoncpp2-android/m4/ost_endian.m4 b/jni/commoncpp2-android/sources/m4/ost_endian.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_endian.m4
rename to jni/commoncpp2-android/sources/m4/ost_endian.m4
diff --git a/jni/commoncpp2-android/m4/ost_getopt.m4 b/jni/commoncpp2-android/sources/m4/ost_getopt.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_getopt.m4
rename to jni/commoncpp2-android/sources/m4/ost_getopt.m4
diff --git a/jni/commoncpp2-android/m4/ost_maint.m4 b/jni/commoncpp2-android/sources/m4/ost_maint.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_maint.m4
rename to jni/commoncpp2-android/sources/m4/ost_maint.m4
diff --git a/jni/commoncpp2-android/m4/ost_misc.m4 b/jni/commoncpp2-android/sources/m4/ost_misc.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_misc.m4
rename to jni/commoncpp2-android/sources/m4/ost_misc.m4
diff --git a/jni/commoncpp2-android/m4/ost_poll.m4 b/jni/commoncpp2-android/sources/m4/ost_poll.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_poll.m4
rename to jni/commoncpp2-android/sources/m4/ost_poll.m4
diff --git a/jni/commoncpp2-android/m4/ost_posix.m4 b/jni/commoncpp2-android/sources/m4/ost_posix.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_posix.m4
rename to jni/commoncpp2-android/sources/m4/ost_posix.m4
diff --git a/jni/commoncpp2-android/m4/ost_prog.m4 b/jni/commoncpp2-android/sources/m4/ost_prog.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_prog.m4
rename to jni/commoncpp2-android/sources/m4/ost_prog.m4
diff --git a/jni/commoncpp2-android/m4/ost_pthread.m4 b/jni/commoncpp2-android/sources/m4/ost_pthread.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_pthread.m4
rename to jni/commoncpp2-android/sources/m4/ost_pthread.m4
diff --git a/jni/commoncpp2-android/m4/ost_reentrant.m4 b/jni/commoncpp2-android/sources/m4/ost_reentrant.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_reentrant.m4
rename to jni/commoncpp2-android/sources/m4/ost_reentrant.m4
diff --git a/jni/commoncpp2-android/m4/ost_signal.m4 b/jni/commoncpp2-android/sources/m4/ost_signal.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_signal.m4
rename to jni/commoncpp2-android/sources/m4/ost_signal.m4
diff --git a/jni/commoncpp2-android/m4/ost_socket.m4 b/jni/commoncpp2-android/sources/m4/ost_socket.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_socket.m4
rename to jni/commoncpp2-android/sources/m4/ost_socket.m4
diff --git a/jni/commoncpp2-android/m4/ost_ssl.m4 b/jni/commoncpp2-android/sources/m4/ost_ssl.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_ssl.m4
rename to jni/commoncpp2-android/sources/m4/ost_ssl.m4
diff --git a/jni/commoncpp2-android/m4/ost_stlport.m4 b/jni/commoncpp2-android/sources/m4/ost_stlport.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_stlport.m4
rename to jni/commoncpp2-android/sources/m4/ost_stlport.m4
diff --git a/jni/commoncpp2-android/m4/ost_string.m4 b/jni/commoncpp2-android/sources/m4/ost_string.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_string.m4
rename to jni/commoncpp2-android/sources/m4/ost_string.m4
diff --git a/jni/commoncpp2-android/m4/ost_systime.m4 b/jni/commoncpp2-android/sources/m4/ost_systime.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_systime.m4
rename to jni/commoncpp2-android/sources/m4/ost_systime.m4
diff --git a/jni/commoncpp2-android/m4/ost_types.m4 b/jni/commoncpp2-android/sources/m4/ost_types.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_types.m4
rename to jni/commoncpp2-android/sources/m4/ost_types.m4
diff --git a/jni/commoncpp2-android/m4/ost_win32.m4 b/jni/commoncpp2-android/sources/m4/ost_win32.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/ost_win32.m4
rename to jni/commoncpp2-android/sources/m4/ost_win32.m4
diff --git a/jni/commoncpp2-android/m4/win32msc.m4 b/jni/commoncpp2-android/sources/m4/win32msc.m4
similarity index 100%
rename from jni/commoncpp2-android/m4/win32msc.m4
rename to jni/commoncpp2-android/sources/m4/win32msc.m4
diff --git a/jni/commoncpp2-android/src/.deps/applog.Plo b/jni/commoncpp2-android/sources/src/.deps/applog.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/applog.Plo
rename to jni/commoncpp2-android/sources/src/.deps/applog.Plo
diff --git a/jni/commoncpp2-android/src/.deps/assoc.Plo b/jni/commoncpp2-android/sources/src/.deps/assoc.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/assoc.Plo
rename to jni/commoncpp2-android/sources/src/.deps/assoc.Plo
diff --git a/jni/commoncpp2-android/src/.deps/buffer.Plo b/jni/commoncpp2-android/sources/src/.deps/buffer.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/buffer.Plo
rename to jni/commoncpp2-android/sources/src/.deps/buffer.Plo
diff --git a/jni/commoncpp2-android/src/.deps/cidr.Plo b/jni/commoncpp2-android/sources/src/.deps/cidr.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/cidr.Plo
rename to jni/commoncpp2-android/sources/src/.deps/cidr.Plo
diff --git a/jni/commoncpp2-android/src/.deps/cmdoptns.Plo b/jni/commoncpp2-android/sources/src/.deps/cmdoptns.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/cmdoptns.Plo
rename to jni/commoncpp2-android/sources/src/.deps/cmdoptns.Plo
diff --git a/jni/commoncpp2-android/src/.deps/date.Plo b/jni/commoncpp2-android/sources/src/.deps/date.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/date.Plo
rename to jni/commoncpp2-android/sources/src/.deps/date.Plo
diff --git a/jni/commoncpp2-android/src/.deps/digest.Plo b/jni/commoncpp2-android/sources/src/.deps/digest.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/digest.Plo
rename to jni/commoncpp2-android/sources/src/.deps/digest.Plo
diff --git a/jni/commoncpp2-android/src/.deps/dir.Plo b/jni/commoncpp2-android/sources/src/.deps/dir.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/dir.Plo
rename to jni/commoncpp2-android/sources/src/.deps/dir.Plo
diff --git a/jni/commoncpp2-android/src/.deps/dso.Plo b/jni/commoncpp2-android/sources/src/.deps/dso.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/dso.Plo
rename to jni/commoncpp2-android/sources/src/.deps/dso.Plo
diff --git a/jni/commoncpp2-android/src/.deps/engine.Plo b/jni/commoncpp2-android/sources/src/.deps/engine.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/engine.Plo
rename to jni/commoncpp2-android/sources/src/.deps/engine.Plo
diff --git a/jni/commoncpp2-android/src/.deps/event.Plo b/jni/commoncpp2-android/sources/src/.deps/event.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/event.Plo
rename to jni/commoncpp2-android/sources/src/.deps/event.Plo
diff --git a/jni/commoncpp2-android/src/.deps/exception.Plo b/jni/commoncpp2-android/sources/src/.deps/exception.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/exception.Plo
rename to jni/commoncpp2-android/sources/src/.deps/exception.Plo
diff --git a/jni/commoncpp2-android/src/.deps/file.Plo b/jni/commoncpp2-android/sources/src/.deps/file.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/file.Plo
rename to jni/commoncpp2-android/sources/src/.deps/file.Plo
diff --git a/jni/commoncpp2-android/src/.deps/friends.Plo b/jni/commoncpp2-android/sources/src/.deps/friends.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/friends.Plo
rename to jni/commoncpp2-android/sources/src/.deps/friends.Plo
diff --git a/jni/commoncpp2-android/src/.deps/getopt.Plo b/jni/commoncpp2-android/sources/src/.deps/getopt.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/getopt.Plo
rename to jni/commoncpp2-android/sources/src/.deps/getopt.Plo
diff --git a/jni/commoncpp2-android/src/.deps/getopt1.Plo b/jni/commoncpp2-android/sources/src/.deps/getopt1.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/getopt1.Plo
rename to jni/commoncpp2-android/sources/src/.deps/getopt1.Plo
diff --git a/jni/commoncpp2-android/src/.deps/in6addr.Plo b/jni/commoncpp2-android/sources/src/.deps/in6addr.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/in6addr.Plo
rename to jni/commoncpp2-android/sources/src/.deps/in6addr.Plo
diff --git a/jni/commoncpp2-android/src/.deps/inaddr.Plo b/jni/commoncpp2-android/sources/src/.deps/inaddr.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/inaddr.Plo
rename to jni/commoncpp2-android/sources/src/.deps/inaddr.Plo
diff --git a/jni/commoncpp2-android/src/.deps/keydata.Plo b/jni/commoncpp2-android/sources/src/.deps/keydata.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/keydata.Plo
rename to jni/commoncpp2-android/sources/src/.deps/keydata.Plo
diff --git a/jni/commoncpp2-android/src/.deps/linked.Plo b/jni/commoncpp2-android/sources/src/.deps/linked.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/linked.Plo
rename to jni/commoncpp2-android/sources/src/.deps/linked.Plo
diff --git a/jni/commoncpp2-android/src/.deps/lockfile.Plo b/jni/commoncpp2-android/sources/src/.deps/lockfile.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/lockfile.Plo
rename to jni/commoncpp2-android/sources/src/.deps/lockfile.Plo
diff --git a/jni/commoncpp2-android/src/.deps/map.Plo b/jni/commoncpp2-android/sources/src/.deps/map.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/map.Plo
rename to jni/commoncpp2-android/sources/src/.deps/map.Plo
diff --git a/jni/commoncpp2-android/src/.deps/md5.Plo b/jni/commoncpp2-android/sources/src/.deps/md5.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/md5.Plo
rename to jni/commoncpp2-android/sources/src/.deps/md5.Plo
diff --git a/jni/commoncpp2-android/src/.deps/mempager.Plo b/jni/commoncpp2-android/sources/src/.deps/mempager.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/mempager.Plo
rename to jni/commoncpp2-android/sources/src/.deps/mempager.Plo
diff --git a/jni/commoncpp2-android/src/.deps/mime.Plo b/jni/commoncpp2-android/sources/src/.deps/mime.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/mime.Plo
rename to jni/commoncpp2-android/sources/src/.deps/mime.Plo
diff --git a/jni/commoncpp2-android/src/.deps/missing.Plo b/jni/commoncpp2-android/sources/src/.deps/missing.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/missing.Plo
rename to jni/commoncpp2-android/sources/src/.deps/missing.Plo
diff --git a/jni/commoncpp2-android/src/.deps/mutex.Plo b/jni/commoncpp2-android/sources/src/.deps/mutex.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/mutex.Plo
rename to jni/commoncpp2-android/sources/src/.deps/mutex.Plo
diff --git a/jni/commoncpp2-android/src/.deps/nat.Plo b/jni/commoncpp2-android/sources/src/.deps/nat.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/nat.Plo
rename to jni/commoncpp2-android/sources/src/.deps/nat.Plo
diff --git a/jni/commoncpp2-android/src/.deps/network.Plo b/jni/commoncpp2-android/sources/src/.deps/network.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/network.Plo
rename to jni/commoncpp2-android/sources/src/.deps/network.Plo
diff --git a/jni/commoncpp2-android/src/.deps/numbers.Plo b/jni/commoncpp2-android/sources/src/.deps/numbers.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/numbers.Plo
rename to jni/commoncpp2-android/sources/src/.deps/numbers.Plo
diff --git a/jni/commoncpp2-android/src/.deps/peer.Plo b/jni/commoncpp2-android/sources/src/.deps/peer.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/peer.Plo
rename to jni/commoncpp2-android/sources/src/.deps/peer.Plo
diff --git a/jni/commoncpp2-android/src/.deps/persist.Plo b/jni/commoncpp2-android/sources/src/.deps/persist.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/persist.Plo
rename to jni/commoncpp2-android/sources/src/.deps/persist.Plo
diff --git a/jni/commoncpp2-android/src/.deps/pointer.Plo b/jni/commoncpp2-android/sources/src/.deps/pointer.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/pointer.Plo
rename to jni/commoncpp2-android/sources/src/.deps/pointer.Plo
diff --git a/jni/commoncpp2-android/src/.deps/process.Plo b/jni/commoncpp2-android/sources/src/.deps/process.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/process.Plo
rename to jni/commoncpp2-android/sources/src/.deps/process.Plo
diff --git a/jni/commoncpp2-android/src/.deps/runlist.Plo b/jni/commoncpp2-android/sources/src/.deps/runlist.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/runlist.Plo
rename to jni/commoncpp2-android/sources/src/.deps/runlist.Plo
diff --git a/jni/commoncpp2-android/src/.deps/semaphore.Plo b/jni/commoncpp2-android/sources/src/.deps/semaphore.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/semaphore.Plo
rename to jni/commoncpp2-android/sources/src/.deps/semaphore.Plo
diff --git a/jni/commoncpp2-android/src/.deps/serial.Plo b/jni/commoncpp2-android/sources/src/.deps/serial.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/serial.Plo
rename to jni/commoncpp2-android/sources/src/.deps/serial.Plo
diff --git a/jni/commoncpp2-android/src/.deps/simplesocket.Plo b/jni/commoncpp2-android/sources/src/.deps/simplesocket.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/simplesocket.Plo
rename to jni/commoncpp2-android/sources/src/.deps/simplesocket.Plo
diff --git a/jni/commoncpp2-android/src/.deps/slog.Plo b/jni/commoncpp2-android/sources/src/.deps/slog.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/slog.Plo
rename to jni/commoncpp2-android/sources/src/.deps/slog.Plo
diff --git a/jni/commoncpp2-android/src/.deps/socket.Plo b/jni/commoncpp2-android/sources/src/.deps/socket.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/socket.Plo
rename to jni/commoncpp2-android/sources/src/.deps/socket.Plo
diff --git a/jni/commoncpp2-android/src/.deps/socketport.Plo b/jni/commoncpp2-android/sources/src/.deps/socketport.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/socketport.Plo
rename to jni/commoncpp2-android/sources/src/.deps/socketport.Plo
diff --git a/jni/commoncpp2-android/src/.deps/ssl.Plo b/jni/commoncpp2-android/sources/src/.deps/ssl.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/ssl.Plo
rename to jni/commoncpp2-android/sources/src/.deps/ssl.Plo
diff --git a/jni/commoncpp2-android/src/.deps/strchar.Plo b/jni/commoncpp2-android/sources/src/.deps/strchar.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/strchar.Plo
rename to jni/commoncpp2-android/sources/src/.deps/strchar.Plo
diff --git a/jni/commoncpp2-android/src/.deps/string.Plo b/jni/commoncpp2-android/sources/src/.deps/string.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/string.Plo
rename to jni/commoncpp2-android/sources/src/.deps/string.Plo
diff --git a/jni/commoncpp2-android/src/.deps/thread.Plo b/jni/commoncpp2-android/sources/src/.deps/thread.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/thread.Plo
rename to jni/commoncpp2-android/sources/src/.deps/thread.Plo
diff --git a/jni/commoncpp2-android/src/.deps/threadkey.Plo b/jni/commoncpp2-android/sources/src/.deps/threadkey.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/threadkey.Plo
rename to jni/commoncpp2-android/sources/src/.deps/threadkey.Plo
diff --git a/jni/commoncpp2-android/src/.deps/timer.Plo b/jni/commoncpp2-android/sources/src/.deps/timer.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/timer.Plo
rename to jni/commoncpp2-android/sources/src/.deps/timer.Plo
diff --git a/jni/commoncpp2-android/src/.deps/tokenizer.Plo b/jni/commoncpp2-android/sources/src/.deps/tokenizer.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/tokenizer.Plo
rename to jni/commoncpp2-android/sources/src/.deps/tokenizer.Plo
diff --git a/jni/commoncpp2-android/src/.deps/unix.Plo b/jni/commoncpp2-android/sources/src/.deps/unix.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/unix.Plo
rename to jni/commoncpp2-android/sources/src/.deps/unix.Plo
diff --git a/jni/commoncpp2-android/src/.deps/url.Plo b/jni/commoncpp2-android/sources/src/.deps/url.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/url.Plo
rename to jni/commoncpp2-android/sources/src/.deps/url.Plo
diff --git a/jni/commoncpp2-android/src/.deps/urlstring.Plo b/jni/commoncpp2-android/sources/src/.deps/urlstring.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/urlstring.Plo
rename to jni/commoncpp2-android/sources/src/.deps/urlstring.Plo
diff --git a/jni/commoncpp2-android/src/.deps/xml.Plo b/jni/commoncpp2-android/sources/src/.deps/xml.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/xml.Plo
rename to jni/commoncpp2-android/sources/src/.deps/xml.Plo
diff --git a/jni/commoncpp2-android/src/.deps/zstream.Plo b/jni/commoncpp2-android/sources/src/.deps/zstream.Plo
similarity index 100%
rename from jni/commoncpp2-android/src/.deps/zstream.Plo
rename to jni/commoncpp2-android/sources/src/.deps/zstream.Plo
diff --git a/jni/commoncpp2-android/src/Makefile b/jni/commoncpp2-android/sources/src/Makefile
similarity index 100%
rename from jni/commoncpp2-android/src/Makefile
rename to jni/commoncpp2-android/sources/src/Makefile
diff --git a/jni/commoncpp2-android/src/Makefile.am b/jni/commoncpp2-android/sources/src/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/src/Makefile.am
rename to jni/commoncpp2-android/sources/src/Makefile.am
diff --git a/jni/commoncpp2-android/src/Makefile.in b/jni/commoncpp2-android/sources/src/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/src/Makefile.in
rename to jni/commoncpp2-android/sources/src/Makefile.in
diff --git a/jni/commoncpp2-android/src/applog.cpp b/jni/commoncpp2-android/sources/src/applog.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/applog.cpp
rename to jni/commoncpp2-android/sources/src/applog.cpp
diff --git a/jni/commoncpp2-android/src/assoc.cpp b/jni/commoncpp2-android/sources/src/assoc.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/assoc.cpp
rename to jni/commoncpp2-android/sources/src/assoc.cpp
diff --git a/jni/commoncpp2-android/src/buffer.cpp b/jni/commoncpp2-android/sources/src/buffer.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/buffer.cpp
rename to jni/commoncpp2-android/sources/src/buffer.cpp
diff --git a/jni/commoncpp2-android/src/ccgnu2-config b/jni/commoncpp2-android/sources/src/ccgnu2-config
similarity index 100%
rename from jni/commoncpp2-android/src/ccgnu2-config
rename to jni/commoncpp2-android/sources/src/ccgnu2-config
diff --git a/jni/commoncpp2-android/src/ccgnu2-config.in b/jni/commoncpp2-android/sources/src/ccgnu2-config.in
similarity index 100%
rename from jni/commoncpp2-android/src/ccgnu2-config.in
rename to jni/commoncpp2-android/sources/src/ccgnu2-config.in
diff --git a/jni/commoncpp2-android/src/cidr.cpp b/jni/commoncpp2-android/sources/src/cidr.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/cidr.cpp
rename to jni/commoncpp2-android/sources/src/cidr.cpp
diff --git a/jni/commoncpp2-android/src/cmdoptns.cpp b/jni/commoncpp2-android/sources/src/cmdoptns.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/cmdoptns.cpp
rename to jni/commoncpp2-android/sources/src/cmdoptns.cpp
diff --git a/jni/commoncpp2-android/src/date.cpp b/jni/commoncpp2-android/sources/src/date.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/date.cpp
rename to jni/commoncpp2-android/sources/src/date.cpp
diff --git a/jni/commoncpp2-android/src/digest.cpp b/jni/commoncpp2-android/sources/src/digest.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/digest.cpp
rename to jni/commoncpp2-android/sources/src/digest.cpp
diff --git a/jni/commoncpp2-android/src/dir.cpp b/jni/commoncpp2-android/sources/src/dir.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/dir.cpp
rename to jni/commoncpp2-android/sources/src/dir.cpp
diff --git a/jni/commoncpp2-android/src/dso.cpp b/jni/commoncpp2-android/sources/src/dso.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/dso.cpp
rename to jni/commoncpp2-android/sources/src/dso.cpp
diff --git a/jni/commoncpp2-android/src/engine.cpp b/jni/commoncpp2-android/sources/src/engine.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/engine.cpp
rename to jni/commoncpp2-android/sources/src/engine.cpp
diff --git a/jni/commoncpp2-android/src/event.cpp b/jni/commoncpp2-android/sources/src/event.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/event.cpp
rename to jni/commoncpp2-android/sources/src/event.cpp
diff --git a/jni/commoncpp2-android/src/exception.cpp b/jni/commoncpp2-android/sources/src/exception.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/exception.cpp
rename to jni/commoncpp2-android/sources/src/exception.cpp
diff --git a/jni/commoncpp2-android/src/file.cpp b/jni/commoncpp2-android/sources/src/file.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/file.cpp
rename to jni/commoncpp2-android/sources/src/file.cpp
diff --git a/jni/commoncpp2-android/src/friends.cpp b/jni/commoncpp2-android/sources/src/friends.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/friends.cpp
rename to jni/commoncpp2-android/sources/src/friends.cpp
diff --git a/jni/commoncpp2-android/src/getopt.c b/jni/commoncpp2-android/sources/src/getopt.c
similarity index 100%
rename from jni/commoncpp2-android/src/getopt.c
rename to jni/commoncpp2-android/sources/src/getopt.c
diff --git a/jni/commoncpp2-android/src/getopt.h b/jni/commoncpp2-android/sources/src/getopt.h
similarity index 100%
rename from jni/commoncpp2-android/src/getopt.h
rename to jni/commoncpp2-android/sources/src/getopt.h
diff --git a/jni/commoncpp2-android/src/getopt1.c b/jni/commoncpp2-android/sources/src/getopt1.c
similarity index 100%
rename from jni/commoncpp2-android/src/getopt1.c
rename to jni/commoncpp2-android/sources/src/getopt1.c
diff --git a/jni/commoncpp2-android/src/in6addr.cpp b/jni/commoncpp2-android/sources/src/in6addr.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/in6addr.cpp
rename to jni/commoncpp2-android/sources/src/in6addr.cpp
diff --git a/jni/commoncpp2-android/src/inaddr.cpp b/jni/commoncpp2-android/sources/src/inaddr.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/inaddr.cpp
rename to jni/commoncpp2-android/sources/src/inaddr.cpp
diff --git a/jni/commoncpp2-android/src/keydata.cpp b/jni/commoncpp2-android/sources/src/keydata.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/keydata.cpp
rename to jni/commoncpp2-android/sources/src/keydata.cpp
diff --git a/jni/commoncpp2-android/src/libccext2.pc b/jni/commoncpp2-android/sources/src/libccext2.pc
similarity index 100%
rename from jni/commoncpp2-android/src/libccext2.pc
rename to jni/commoncpp2-android/sources/src/libccext2.pc
diff --git a/jni/commoncpp2-android/src/libccext2.pc.in b/jni/commoncpp2-android/sources/src/libccext2.pc.in
similarity index 100%
rename from jni/commoncpp2-android/src/libccext2.pc.in
rename to jni/commoncpp2-android/sources/src/libccext2.pc.in
diff --git a/jni/commoncpp2-android/src/libccgnu2.pc b/jni/commoncpp2-android/sources/src/libccgnu2.pc
similarity index 100%
rename from jni/commoncpp2-android/src/libccgnu2.pc
rename to jni/commoncpp2-android/sources/src/libccgnu2.pc
diff --git a/jni/commoncpp2-android/src/libccgnu2.pc.in b/jni/commoncpp2-android/sources/src/libccgnu2.pc.in
similarity index 100%
rename from jni/commoncpp2-android/src/libccgnu2.pc.in
rename to jni/commoncpp2-android/sources/src/libccgnu2.pc.in
diff --git a/jni/commoncpp2-android/src/linked.cpp b/jni/commoncpp2-android/sources/src/linked.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/linked.cpp
rename to jni/commoncpp2-android/sources/src/linked.cpp
diff --git a/jni/commoncpp2-android/src/lockfile.cpp b/jni/commoncpp2-android/sources/src/lockfile.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/lockfile.cpp
rename to jni/commoncpp2-android/sources/src/lockfile.cpp
diff --git a/jni/commoncpp2-android/src/map.cpp b/jni/commoncpp2-android/sources/src/map.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/map.cpp
rename to jni/commoncpp2-android/sources/src/map.cpp
diff --git a/jni/commoncpp2-android/src/md5.cpp b/jni/commoncpp2-android/sources/src/md5.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/md5.cpp
rename to jni/commoncpp2-android/sources/src/md5.cpp
diff --git a/jni/commoncpp2-android/src/mempager.cpp b/jni/commoncpp2-android/sources/src/mempager.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/mempager.cpp
rename to jni/commoncpp2-android/sources/src/mempager.cpp
diff --git a/jni/commoncpp2-android/src/mime.cpp b/jni/commoncpp2-android/sources/src/mime.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/mime.cpp
rename to jni/commoncpp2-android/sources/src/mime.cpp
diff --git a/jni/commoncpp2-android/src/missing.cpp b/jni/commoncpp2-android/sources/src/missing.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/missing.cpp
rename to jni/commoncpp2-android/sources/src/missing.cpp
diff --git a/jni/commoncpp2-android/src/mutex.cpp b/jni/commoncpp2-android/sources/src/mutex.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/mutex.cpp
rename to jni/commoncpp2-android/sources/src/mutex.cpp
diff --git a/jni/commoncpp2-android/src/nat.cpp b/jni/commoncpp2-android/sources/src/nat.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/nat.cpp
rename to jni/commoncpp2-android/sources/src/nat.cpp
diff --git a/jni/commoncpp2-android/src/nat.h b/jni/commoncpp2-android/sources/src/nat.h
similarity index 100%
rename from jni/commoncpp2-android/src/nat.h
rename to jni/commoncpp2-android/sources/src/nat.h
diff --git a/jni/commoncpp2-android/src/network.cpp b/jni/commoncpp2-android/sources/src/network.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/network.cpp
rename to jni/commoncpp2-android/sources/src/network.cpp
diff --git a/jni/commoncpp2-android/src/numbers.cpp b/jni/commoncpp2-android/sources/src/numbers.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/numbers.cpp
rename to jni/commoncpp2-android/sources/src/numbers.cpp
diff --git a/jni/commoncpp2-android/src/ost_check2.m4 b/jni/commoncpp2-android/sources/src/ost_check2.m4
similarity index 100%
rename from jni/commoncpp2-android/src/ost_check2.m4
rename to jni/commoncpp2-android/sources/src/ost_check2.m4
diff --git a/jni/commoncpp2-android/src/peer.cpp b/jni/commoncpp2-android/sources/src/peer.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/peer.cpp
rename to jni/commoncpp2-android/sources/src/peer.cpp
diff --git a/jni/commoncpp2-android/src/persist.cpp b/jni/commoncpp2-android/sources/src/persist.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/persist.cpp
rename to jni/commoncpp2-android/sources/src/persist.cpp
diff --git a/jni/commoncpp2-android/src/pointer.cpp b/jni/commoncpp2-android/sources/src/pointer.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/pointer.cpp
rename to jni/commoncpp2-android/sources/src/pointer.cpp
diff --git a/jni/commoncpp2-android/src/private.h b/jni/commoncpp2-android/sources/src/private.h
similarity index 100%
rename from jni/commoncpp2-android/src/private.h
rename to jni/commoncpp2-android/sources/src/private.h
diff --git a/jni/commoncpp2-android/src/process.cpp b/jni/commoncpp2-android/sources/src/process.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/process.cpp
rename to jni/commoncpp2-android/sources/src/process.cpp
diff --git a/jni/commoncpp2-android/src/runlist.cpp b/jni/commoncpp2-android/sources/src/runlist.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/runlist.cpp
rename to jni/commoncpp2-android/sources/src/runlist.cpp
diff --git a/jni/commoncpp2-android/src/semaphore.cpp b/jni/commoncpp2-android/sources/src/semaphore.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/semaphore.cpp
rename to jni/commoncpp2-android/sources/src/semaphore.cpp
diff --git a/jni/commoncpp2-android/src/serial.cpp b/jni/commoncpp2-android/sources/src/serial.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/serial.cpp
rename to jni/commoncpp2-android/sources/src/serial.cpp
diff --git a/jni/commoncpp2-android/src/simplesocket.cpp b/jni/commoncpp2-android/sources/src/simplesocket.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/simplesocket.cpp
rename to jni/commoncpp2-android/sources/src/simplesocket.cpp
diff --git a/jni/commoncpp2-android/src/slog.cpp b/jni/commoncpp2-android/sources/src/slog.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/slog.cpp
rename to jni/commoncpp2-android/sources/src/slog.cpp
diff --git a/jni/commoncpp2-android/src/socket.cpp b/jni/commoncpp2-android/sources/src/socket.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/socket.cpp
rename to jni/commoncpp2-android/sources/src/socket.cpp
diff --git a/jni/commoncpp2-android/src/socketport.cpp b/jni/commoncpp2-android/sources/src/socketport.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/socketport.cpp
rename to jni/commoncpp2-android/sources/src/socketport.cpp
diff --git a/jni/commoncpp2-android/src/ssl.cpp b/jni/commoncpp2-android/sources/src/ssl.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/ssl.cpp
rename to jni/commoncpp2-android/sources/src/ssl.cpp
diff --git a/jni/commoncpp2-android/src/strchar.cpp b/jni/commoncpp2-android/sources/src/strchar.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/strchar.cpp
rename to jni/commoncpp2-android/sources/src/strchar.cpp
diff --git a/jni/commoncpp2-android/src/string.cpp b/jni/commoncpp2-android/sources/src/string.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/string.cpp
rename to jni/commoncpp2-android/sources/src/string.cpp
diff --git a/jni/commoncpp2-android/src/thread.cpp b/jni/commoncpp2-android/sources/src/thread.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/thread.cpp
rename to jni/commoncpp2-android/sources/src/thread.cpp
diff --git a/jni/commoncpp2-android/src/threadkey.cpp b/jni/commoncpp2-android/sources/src/threadkey.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/threadkey.cpp
rename to jni/commoncpp2-android/sources/src/threadkey.cpp
diff --git a/jni/commoncpp2-android/src/timer.cpp b/jni/commoncpp2-android/sources/src/timer.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/timer.cpp
rename to jni/commoncpp2-android/sources/src/timer.cpp
diff --git a/jni/commoncpp2-android/src/tokenizer.cpp b/jni/commoncpp2-android/sources/src/tokenizer.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/tokenizer.cpp
rename to jni/commoncpp2-android/sources/src/tokenizer.cpp
diff --git a/jni/commoncpp2-android/src/unix.cpp b/jni/commoncpp2-android/sources/src/unix.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/unix.cpp
rename to jni/commoncpp2-android/sources/src/unix.cpp
diff --git a/jni/commoncpp2-android/src/url.cpp b/jni/commoncpp2-android/sources/src/url.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/url.cpp
rename to jni/commoncpp2-android/sources/src/url.cpp
diff --git a/jni/commoncpp2-android/src/urlstring.cpp b/jni/commoncpp2-android/sources/src/urlstring.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/urlstring.cpp
rename to jni/commoncpp2-android/sources/src/urlstring.cpp
diff --git a/jni/commoncpp2-android/src/xml.cpp b/jni/commoncpp2-android/sources/src/xml.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/xml.cpp
rename to jni/commoncpp2-android/sources/src/xml.cpp
diff --git a/jni/commoncpp2-android/src/zstream.cpp b/jni/commoncpp2-android/sources/src/zstream.cpp
similarity index 100%
rename from jni/commoncpp2-android/src/zstream.cpp
rename to jni/commoncpp2-android/sources/src/zstream.cpp
diff --git a/jni/commoncpp2-android/stamp-h1 b/jni/commoncpp2-android/sources/stamp-h1
similarity index 100%
rename from jni/commoncpp2-android/stamp-h1
rename to jni/commoncpp2-android/sources/stamp-h1
diff --git a/jni/commoncpp2-android/tests/.deps/SampleObject.Po b/jni/commoncpp2-android/sources/tests/.deps/SampleObject.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/SampleObject.Po
rename to jni/commoncpp2-android/sources/tests/.deps/SampleObject.Po
diff --git a/jni/commoncpp2-android/tests/.deps/SampleSubObject.Po b/jni/commoncpp2-android/sources/tests/.deps/SampleSubObject.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/SampleSubObject.Po
rename to jni/commoncpp2-android/sources/tests/.deps/SampleSubObject.Po
diff --git a/jni/commoncpp2-android/tests/.deps/Test_Date.Po b/jni/commoncpp2-android/sources/tests/.deps/Test_Date.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/Test_Date.Po
rename to jni/commoncpp2-android/sources/tests/.deps/Test_Date.Po
diff --git a/jni/commoncpp2-android/tests/.deps/Test_Engine.Po b/jni/commoncpp2-android/sources/tests/.deps/Test_Engine.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/Test_Engine.Po
rename to jni/commoncpp2-android/sources/tests/.deps/Test_Engine.Po
diff --git a/jni/commoncpp2-android/tests/.deps/Test_TCPStream.Po b/jni/commoncpp2-android/sources/tests/.deps/Test_TCPStream.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/Test_TCPStream.Po
rename to jni/commoncpp2-android/sources/tests/.deps/Test_TCPStream.Po
diff --git a/jni/commoncpp2-android/tests/.deps/Test_URLString.Po b/jni/commoncpp2-android/sources/tests/.deps/Test_URLString.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/Test_URLString.Po
rename to jni/commoncpp2-android/sources/tests/.deps/Test_URLString.Po
diff --git a/jni/commoncpp2-android/tests/.deps/bug1.Po b/jni/commoncpp2-android/sources/tests/.deps/bug1.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/bug1.Po
rename to jni/commoncpp2-android/sources/tests/.deps/bug1.Po
diff --git a/jni/commoncpp2-android/tests/.deps/bug2.Po b/jni/commoncpp2-android/sources/tests/.deps/bug2.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/bug2.Po
rename to jni/commoncpp2-android/sources/tests/.deps/bug2.Po
diff --git a/jni/commoncpp2-android/tests/.deps/ccxx_tests.Po b/jni/commoncpp2-android/sources/tests/.deps/ccxx_tests.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/ccxx_tests.Po
rename to jni/commoncpp2-android/sources/tests/.deps/ccxx_tests.Po
diff --git a/jni/commoncpp2-android/tests/.deps/digest.Po b/jni/commoncpp2-android/sources/tests/.deps/digest.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/digest.Po
rename to jni/commoncpp2-android/sources/tests/.deps/digest.Po
diff --git a/jni/commoncpp2-android/tests/.deps/forever.Po b/jni/commoncpp2-android/sources/tests/.deps/forever.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/forever.Po
rename to jni/commoncpp2-android/sources/tests/.deps/forever.Po
diff --git a/jni/commoncpp2-android/tests/.deps/tcpstr1.Po b/jni/commoncpp2-android/sources/tests/.deps/tcpstr1.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/tcpstr1.Po
rename to jni/commoncpp2-android/sources/tests/.deps/tcpstr1.Po
diff --git a/jni/commoncpp2-android/tests/.deps/thread1.Po b/jni/commoncpp2-android/sources/tests/.deps/thread1.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/thread1.Po
rename to jni/commoncpp2-android/sources/tests/.deps/thread1.Po
diff --git a/jni/commoncpp2-android/tests/.deps/thread2.Po b/jni/commoncpp2-android/sources/tests/.deps/thread2.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/thread2.Po
rename to jni/commoncpp2-android/sources/tests/.deps/thread2.Po
diff --git a/jni/commoncpp2-android/tests/.deps/thread3.Po b/jni/commoncpp2-android/sources/tests/.deps/thread3.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/thread3.Po
rename to jni/commoncpp2-android/sources/tests/.deps/thread3.Po
diff --git a/jni/commoncpp2-android/tests/.deps/url1.Po b/jni/commoncpp2-android/sources/tests/.deps/url1.Po
similarity index 100%
rename from jni/commoncpp2-android/tests/.deps/url1.Po
rename to jni/commoncpp2-android/sources/tests/.deps/url1.Po
diff --git a/jni/commoncpp2-android/tests/Makefile b/jni/commoncpp2-android/sources/tests/Makefile
similarity index 100%
rename from jni/commoncpp2-android/tests/Makefile
rename to jni/commoncpp2-android/sources/tests/Makefile
diff --git a/jni/commoncpp2-android/tests/Makefile.am b/jni/commoncpp2-android/sources/tests/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/tests/Makefile.am
rename to jni/commoncpp2-android/sources/tests/Makefile.am
diff --git a/jni/commoncpp2-android/tests/Makefile.bcc b/jni/commoncpp2-android/sources/tests/Makefile.bcc
similarity index 100%
rename from jni/commoncpp2-android/tests/Makefile.bcc
rename to jni/commoncpp2-android/sources/tests/Makefile.bcc
diff --git a/jni/commoncpp2-android/tests/Makefile.in b/jni/commoncpp2-android/sources/tests/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/tests/Makefile.in
rename to jni/commoncpp2-android/sources/tests/Makefile.in
diff --git a/jni/commoncpp2-android/tests/README b/jni/commoncpp2-android/sources/tests/README
similarity index 100%
rename from jni/commoncpp2-android/tests/README
rename to jni/commoncpp2-android/sources/tests/README
diff --git a/jni/commoncpp2-android/tests/SampleObject.cpp b/jni/commoncpp2-android/sources/tests/SampleObject.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/SampleObject.cpp
rename to jni/commoncpp2-android/sources/tests/SampleObject.cpp
diff --git a/jni/commoncpp2-android/tests/SampleObject.h b/jni/commoncpp2-android/sources/tests/SampleObject.h
similarity index 100%
rename from jni/commoncpp2-android/tests/SampleObject.h
rename to jni/commoncpp2-android/sources/tests/SampleObject.h
diff --git a/jni/commoncpp2-android/tests/SampleSubObject.cpp b/jni/commoncpp2-android/sources/tests/SampleSubObject.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/SampleSubObject.cpp
rename to jni/commoncpp2-android/sources/tests/SampleSubObject.cpp
diff --git a/jni/commoncpp2-android/tests/SampleSubObject.h b/jni/commoncpp2-android/sources/tests/SampleSubObject.h
similarity index 100%
rename from jni/commoncpp2-android/tests/SampleSubObject.h
rename to jni/commoncpp2-android/sources/tests/SampleSubObject.h
diff --git a/jni/commoncpp2-android/tests/Test_Date.cpp b/jni/commoncpp2-android/sources/tests/Test_Date.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_Date.cpp
rename to jni/commoncpp2-android/sources/tests/Test_Date.cpp
diff --git a/jni/commoncpp2-android/tests/Test_Date.h b/jni/commoncpp2-android/sources/tests/Test_Date.h
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_Date.h
rename to jni/commoncpp2-android/sources/tests/Test_Date.h
diff --git a/jni/commoncpp2-android/tests/Test_Digest.h b/jni/commoncpp2-android/sources/tests/Test_Digest.h
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_Digest.h
rename to jni/commoncpp2-android/sources/tests/Test_Digest.h
diff --git a/jni/commoncpp2-android/tests/Test_Engine.cpp b/jni/commoncpp2-android/sources/tests/Test_Engine.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_Engine.cpp
rename to jni/commoncpp2-android/sources/tests/Test_Engine.cpp
diff --git a/jni/commoncpp2-android/tests/Test_Engine.h b/jni/commoncpp2-android/sources/tests/Test_Engine.h
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_Engine.h
rename to jni/commoncpp2-android/sources/tests/Test_Engine.h
diff --git a/jni/commoncpp2-android/tests/Test_SHATumbler.h b/jni/commoncpp2-android/sources/tests/Test_SHATumbler.h
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_SHATumbler.h
rename to jni/commoncpp2-android/sources/tests/Test_SHATumbler.h
diff --git a/jni/commoncpp2-android/tests/Test_TCPStream.cpp b/jni/commoncpp2-android/sources/tests/Test_TCPStream.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_TCPStream.cpp
rename to jni/commoncpp2-android/sources/tests/Test_TCPStream.cpp
diff --git a/jni/commoncpp2-android/tests/Test_TCPStream.h b/jni/commoncpp2-android/sources/tests/Test_TCPStream.h
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_TCPStream.h
rename to jni/commoncpp2-android/sources/tests/Test_TCPStream.h
diff --git a/jni/commoncpp2-android/tests/Test_URLString.cpp b/jni/commoncpp2-android/sources/tests/Test_URLString.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_URLString.cpp
rename to jni/commoncpp2-android/sources/tests/Test_URLString.cpp
diff --git a/jni/commoncpp2-android/tests/Test_URLString.h b/jni/commoncpp2-android/sources/tests/Test_URLString.h
similarity index 100%
rename from jni/commoncpp2-android/tests/Test_URLString.h
rename to jni/commoncpp2-android/sources/tests/Test_URLString.h
diff --git a/jni/commoncpp2-android/tests/bug1.cpp b/jni/commoncpp2-android/sources/tests/bug1.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/bug1.cpp
rename to jni/commoncpp2-android/sources/tests/bug1.cpp
diff --git a/jni/commoncpp2-android/tests/bug2.cpp b/jni/commoncpp2-android/sources/tests/bug2.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/bug2.cpp
rename to jni/commoncpp2-android/sources/tests/bug2.cpp
diff --git a/jni/commoncpp2-android/tests/ccxx_tests.cpp b/jni/commoncpp2-android/sources/tests/ccxx_tests.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/ccxx_tests.cpp
rename to jni/commoncpp2-android/sources/tests/ccxx_tests.cpp
diff --git a/jni/commoncpp2-android/tests/digest.cpp b/jni/commoncpp2-android/sources/tests/digest.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/digest.cpp
rename to jni/commoncpp2-android/sources/tests/digest.cpp
diff --git a/jni/commoncpp2-android/tests/dotests.sh b/jni/commoncpp2-android/sources/tests/dotests.sh
similarity index 100%
rename from jni/commoncpp2-android/tests/dotests.sh
rename to jni/commoncpp2-android/sources/tests/dotests.sh
diff --git a/jni/commoncpp2-android/tests/forever.cpp b/jni/commoncpp2-android/sources/tests/forever.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/forever.cpp
rename to jni/commoncpp2-android/sources/tests/forever.cpp
diff --git a/jni/commoncpp2-android/tests/output.txt b/jni/commoncpp2-android/sources/tests/output.txt
similarity index 100%
rename from jni/commoncpp2-android/tests/output.txt
rename to jni/commoncpp2-android/sources/tests/output.txt
diff --git a/jni/commoncpp2-android/tests/tcpstr1.cpp b/jni/commoncpp2-android/sources/tests/tcpstr1.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/tcpstr1.cpp
rename to jni/commoncpp2-android/sources/tests/tcpstr1.cpp
diff --git a/jni/commoncpp2-android/tests/test.sh b/jni/commoncpp2-android/sources/tests/test.sh
similarity index 100%
rename from jni/commoncpp2-android/tests/test.sh
rename to jni/commoncpp2-android/sources/tests/test.sh
diff --git a/jni/commoncpp2-android/tests/thread1.cpp b/jni/commoncpp2-android/sources/tests/thread1.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/thread1.cpp
rename to jni/commoncpp2-android/sources/tests/thread1.cpp
diff --git a/jni/commoncpp2-android/tests/thread2.cpp b/jni/commoncpp2-android/sources/tests/thread2.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/thread2.cpp
rename to jni/commoncpp2-android/sources/tests/thread2.cpp
diff --git a/jni/commoncpp2-android/tests/thread3.cpp b/jni/commoncpp2-android/sources/tests/thread3.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/thread3.cpp
rename to jni/commoncpp2-android/sources/tests/thread3.cpp
diff --git a/jni/commoncpp2-android/tests/url1.cpp b/jni/commoncpp2-android/sources/tests/url1.cpp
similarity index 100%
rename from jni/commoncpp2-android/tests/url1.cpp
rename to jni/commoncpp2-android/sources/tests/url1.cpp
diff --git a/jni/commoncpp2-android/tests/vc6.mak b/jni/commoncpp2-android/sources/tests/vc6.mak
similarity index 100%
rename from jni/commoncpp2-android/tests/vc6.mak
rename to jni/commoncpp2-android/sources/tests/vc6.mak
diff --git a/jni/commoncpp2-android/w32/Makefile b/jni/commoncpp2-android/sources/w32/Makefile
similarity index 100%
rename from jni/commoncpp2-android/w32/Makefile
rename to jni/commoncpp2-android/sources/w32/Makefile
diff --git a/jni/commoncpp2-android/w32/Makefile.am b/jni/commoncpp2-android/sources/w32/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/w32/Makefile.am
rename to jni/commoncpp2-android/sources/w32/Makefile.am
diff --git a/jni/commoncpp2-android/w32/Makefile.bcc b/jni/commoncpp2-android/sources/w32/Makefile.bcc
similarity index 100%
rename from jni/commoncpp2-android/w32/Makefile.bcc
rename to jni/commoncpp2-android/sources/w32/Makefile.bcc
diff --git a/jni/commoncpp2-android/w32/Makefile.gcc b/jni/commoncpp2-android/sources/w32/Makefile.gcc
similarity index 100%
rename from jni/commoncpp2-android/w32/Makefile.gcc
rename to jni/commoncpp2-android/sources/w32/Makefile.gcc
diff --git a/jni/commoncpp2-android/w32/Makefile.in b/jni/commoncpp2-android/sources/w32/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/w32/Makefile.in
rename to jni/commoncpp2-android/sources/w32/Makefile.in
diff --git a/jni/commoncpp2-android/w32/cc++/config.h b/jni/commoncpp2-android/sources/w32/cc++/config.h
similarity index 100%
rename from jni/commoncpp2-android/w32/cc++/config.h
rename to jni/commoncpp2-android/sources/w32/cc++/config.h
diff --git a/jni/commoncpp2-android/w32/ccext2.dsp b/jni/commoncpp2-android/sources/w32/ccext2.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/ccext2.dsp
rename to jni/commoncpp2-android/sources/w32/ccext2.dsp
diff --git a/jni/commoncpp2-android/w32/ccext2.dsp.in b/jni/commoncpp2-android/sources/w32/ccext2.dsp.in
similarity index 100%
rename from jni/commoncpp2-android/w32/ccext2.dsp.in
rename to jni/commoncpp2-android/sources/w32/ccext2.dsp.in
diff --git a/jni/commoncpp2-android/w32/ccext2.vcproj b/jni/commoncpp2-android/sources/w32/ccext2.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/ccext2.vcproj
rename to jni/commoncpp2-android/sources/w32/ccext2.vcproj
diff --git a/jni/commoncpp2-android/w32/ccext2.vcproj.in b/jni/commoncpp2-android/sources/w32/ccext2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-android/w32/ccext2.vcproj.in
rename to jni/commoncpp2-android/sources/w32/ccext2.vcproj.in
diff --git a/jni/commoncpp2-android/w32/ccgnu2.dsp b/jni/commoncpp2-android/sources/w32/ccgnu2.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/ccgnu2.dsp
rename to jni/commoncpp2-android/sources/w32/ccgnu2.dsp
diff --git a/jni/commoncpp2-android/w32/ccgnu2.dsp.in b/jni/commoncpp2-android/sources/w32/ccgnu2.dsp.in
similarity index 100%
rename from jni/commoncpp2-android/w32/ccgnu2.dsp.in
rename to jni/commoncpp2-android/sources/w32/ccgnu2.dsp.in
diff --git a/jni/commoncpp2-android/w32/ccgnu2.vcproj b/jni/commoncpp2-android/sources/w32/ccgnu2.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/ccgnu2.vcproj
rename to jni/commoncpp2-android/sources/w32/ccgnu2.vcproj
diff --git a/jni/commoncpp2-android/w32/ccgnu2.vcproj.in b/jni/commoncpp2-android/sources/w32/ccgnu2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-android/w32/ccgnu2.vcproj.in
rename to jni/commoncpp2-android/sources/w32/ccgnu2.vcproj.in
diff --git a/jni/commoncpp2-android/w32/common.dsw b/jni/commoncpp2-android/sources/w32/common.dsw
similarity index 100%
rename from jni/commoncpp2-android/w32/common.dsw
rename to jni/commoncpp2-android/sources/w32/common.dsw
diff --git a/jni/commoncpp2-android/w32/common.reg b/jni/commoncpp2-android/sources/w32/common.reg
similarity index 100%
rename from jni/commoncpp2-android/w32/common.reg
rename to jni/commoncpp2-android/sources/w32/common.reg
diff --git a/jni/commoncpp2-android/w32/common.sln b/jni/commoncpp2-android/sources/w32/common.sln
similarity index 100%
rename from jni/commoncpp2-android/w32/common.sln
rename to jni/commoncpp2-android/sources/w32/common.sln
diff --git a/jni/commoncpp2-android/w32/debug.bat b/jni/commoncpp2-android/sources/w32/debug.bat
similarity index 100%
rename from jni/commoncpp2-android/w32/debug.bat
rename to jni/commoncpp2-android/sources/w32/debug.bat
Binary files differ
diff --git a/jni/commoncpp2-android/w32/demo/SampleSocketPort.dsp b/jni/commoncpp2-android/sources/w32/demo/SampleSocketPort.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/SampleSocketPort.dsp
rename to jni/commoncpp2-android/sources/w32/demo/SampleSocketPort.dsp
diff --git a/jni/commoncpp2-android/w32/demo/SampleSocketPort.vcproj b/jni/commoncpp2-android/sources/w32/demo/SampleSocketPort.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/SampleSocketPort.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/SampleSocketPort.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/buffer.dsp b/jni/commoncpp2-android/sources/w32/demo/buffer.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/buffer.dsp
rename to jni/commoncpp2-android/sources/w32/demo/buffer.dsp
diff --git a/jni/commoncpp2-android/w32/demo/buffer.vcproj b/jni/commoncpp2-android/sources/w32/demo/buffer.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/buffer.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/buffer.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/crc32.dsp b/jni/commoncpp2-android/sources/w32/demo/crc32.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/crc32.dsp
rename to jni/commoncpp2-android/sources/w32/demo/crc32.dsp
diff --git a/jni/commoncpp2-android/w32/demo/crc32.vcproj b/jni/commoncpp2-android/sources/w32/demo/crc32.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/crc32.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/crc32.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/netdevices.dsp b/jni/commoncpp2-android/sources/w32/demo/netdevices.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/netdevices.dsp
rename to jni/commoncpp2-android/sources/w32/demo/netdevices.dsp
diff --git a/jni/commoncpp2-android/w32/demo/netdevices.vcproj b/jni/commoncpp2-android/sources/w32/demo/netdevices.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/netdevices.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/netdevices.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/slogTest.dsp b/jni/commoncpp2-android/sources/w32/demo/slogTest.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/slogTest.dsp
rename to jni/commoncpp2-android/sources/w32/demo/slogTest.dsp
diff --git a/jni/commoncpp2-android/w32/demo/slogTest.vcproj b/jni/commoncpp2-android/sources/w32/demo/slogTest.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/slogTest.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/slogTest.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/tcp.dsp b/jni/commoncpp2-android/sources/w32/demo/tcp.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/tcp.dsp
rename to jni/commoncpp2-android/sources/w32/demo/tcp.dsp
diff --git a/jni/commoncpp2-android/w32/demo/tcp.vcproj b/jni/commoncpp2-android/sources/w32/demo/tcp.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/tcp.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/tcp.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/tcpservice.dsp b/jni/commoncpp2-android/sources/w32/demo/tcpservice.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/tcpservice.dsp
rename to jni/commoncpp2-android/sources/w32/demo/tcpservice.dsp
diff --git a/jni/commoncpp2-android/w32/demo/tcpservice.vcproj b/jni/commoncpp2-android/sources/w32/demo/tcpservice.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/tcpservice.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/tcpservice.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/tcpthread.dsp b/jni/commoncpp2-android/sources/w32/demo/tcpthread.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/tcpthread.dsp
rename to jni/commoncpp2-android/sources/w32/demo/tcpthread.dsp
diff --git a/jni/commoncpp2-android/w32/demo/tcpthread.vcproj b/jni/commoncpp2-android/sources/w32/demo/tcpthread.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/tcpthread.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/tcpthread.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/urlfetch.dsp b/jni/commoncpp2-android/sources/w32/demo/urlfetch.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/urlfetch.dsp
rename to jni/commoncpp2-android/sources/w32/demo/urlfetch.dsp
diff --git a/jni/commoncpp2-android/w32/demo/urlfetch.vcproj b/jni/commoncpp2-android/sources/w32/demo/urlfetch.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/urlfetch.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/urlfetch.vcproj
diff --git a/jni/commoncpp2-android/w32/demo/xmlfetch.dsp b/jni/commoncpp2-android/sources/w32/demo/xmlfetch.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/xmlfetch.dsp
rename to jni/commoncpp2-android/sources/w32/demo/xmlfetch.dsp
diff --git a/jni/commoncpp2-android/w32/demo/xmlfetch.vcproj b/jni/commoncpp2-android/sources/w32/demo/xmlfetch.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/demo/xmlfetch.vcproj
rename to jni/commoncpp2-android/sources/w32/demo/xmlfetch.vcproj
diff --git a/jni/commoncpp2-android/w32/tests/bug1.dsp b/jni/commoncpp2-android/sources/w32/tests/bug1.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/bug1.dsp
rename to jni/commoncpp2-android/sources/w32/tests/bug1.dsp
diff --git a/jni/commoncpp2-android/w32/tests/bug2.dsp b/jni/commoncpp2-android/sources/w32/tests/bug2.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/bug2.dsp
rename to jni/commoncpp2-android/sources/w32/tests/bug2.dsp
diff --git a/jni/commoncpp2-android/w32/tests/ccxx_testsuite.dsp b/jni/commoncpp2-android/sources/w32/tests/ccxx_testsuite.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/ccxx_testsuite.dsp
rename to jni/commoncpp2-android/sources/w32/tests/ccxx_testsuite.dsp
diff --git a/jni/commoncpp2-android/w32/tests/digest.dsp b/jni/commoncpp2-android/sources/w32/tests/digest.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/digest.dsp
rename to jni/commoncpp2-android/sources/w32/tests/digest.dsp
diff --git a/jni/commoncpp2-android/w32/tests/tcpstr1.dsp b/jni/commoncpp2-android/sources/w32/tests/tcpstr1.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/tcpstr1.dsp
rename to jni/commoncpp2-android/sources/w32/tests/tcpstr1.dsp
diff --git a/jni/commoncpp2-android/w32/tests/thread1.dsp b/jni/commoncpp2-android/sources/w32/tests/thread1.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/thread1.dsp
rename to jni/commoncpp2-android/sources/w32/tests/thread1.dsp
diff --git a/jni/commoncpp2-android/w32/tests/thread2.dsp b/jni/commoncpp2-android/sources/w32/tests/thread2.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/thread2.dsp
rename to jni/commoncpp2-android/sources/w32/tests/thread2.dsp
diff --git a/jni/commoncpp2-android/w32/tests/url1.dsp b/jni/commoncpp2-android/sources/w32/tests/url1.dsp
similarity index 100%
rename from jni/commoncpp2-android/w32/tests/url1.dsp
rename to jni/commoncpp2-android/sources/w32/tests/url1.dsp
diff --git a/jni/commoncpp2-android/w32/vs2008/Makefile b/jni/commoncpp2-android/sources/w32/vs2008/Makefile
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/Makefile
rename to jni/commoncpp2-android/sources/w32/vs2008/Makefile
diff --git a/jni/commoncpp2-android/w32/vs2008/Makefile.am b/jni/commoncpp2-android/sources/w32/vs2008/Makefile.am
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/Makefile.am
rename to jni/commoncpp2-android/sources/w32/vs2008/Makefile.am
diff --git a/jni/commoncpp2-android/w32/vs2008/Makefile.in b/jni/commoncpp2-android/sources/w32/vs2008/Makefile.in
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/Makefile.in
rename to jni/commoncpp2-android/sources/w32/vs2008/Makefile.in
diff --git a/jni/commoncpp2-android/w32/vs2008/ccext2.vcproj b/jni/commoncpp2-android/sources/w32/vs2008/ccext2.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/ccext2.vcproj
rename to jni/commoncpp2-android/sources/w32/vs2008/ccext2.vcproj
diff --git a/jni/commoncpp2-android/w32/vs2008/ccext2.vcproj.in b/jni/commoncpp2-android/sources/w32/vs2008/ccext2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/ccext2.vcproj.in
rename to jni/commoncpp2-android/sources/w32/vs2008/ccext2.vcproj.in
diff --git a/jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj b/jni/commoncpp2-android/sources/w32/vs2008/ccgnu2.vcproj
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj
rename to jni/commoncpp2-android/sources/w32/vs2008/ccgnu2.vcproj
diff --git a/jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj.in b/jni/commoncpp2-android/sources/w32/vs2008/ccgnu2.vcproj.in
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/ccgnu2.vcproj.in
rename to jni/commoncpp2-android/sources/w32/vs2008/ccgnu2.vcproj.in
diff --git a/jni/commoncpp2-android/w32/vs2008/common.sln b/jni/commoncpp2-android/sources/w32/vs2008/common.sln
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/common.sln
rename to jni/commoncpp2-android/sources/w32/vs2008/common.sln
Binary files differ
diff --git a/jni/commoncpp2-android/w32/vs2008/common.sln.in b/jni/commoncpp2-android/sources/w32/vs2008/common.sln.in
similarity index 100%
rename from jni/commoncpp2-android/w32/vs2008/common.sln.in
rename to jni/commoncpp2-android/sources/w32/vs2008/common.sln.in
Binary files differ
diff --git a/jni/commoncpp2-android/src/Android.mk b/jni/commoncpp2-android/src/Android.mk
deleted file mode 100644
index f6ba20c..0000000
--- a/jni/commoncpp2-android/src/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LT_VERSION = "0:1"
-LT_RELEASE = "1.8"
-SHARED_FLAGS = "-no-undefined"
-
-LOCAL_CPPFLAGS   += -std=gnu++0x -Wno-psabi -frtti -pthread -fexceptions
-LOCAL_MODULE     := libccgnu2
-LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../inc
-
-LOCAL_SRC_FILES  := thread.cpp mutex.cpp semaphore.cpp threadkey.cpp \
-	friends.cpp event.cpp slog.cpp dir.cpp file.cpp inaddr.cpp \
-	peer.cpp timer.cpp socket.cpp strchar.cpp simplesocket.cpp \
-	mempager.cpp keydata.cpp dso.cpp exception.cpp missing.cpp \
-	process.cpp string.cpp in6addr.cpp buffer.cpp lockfile.cpp \
-	nat.cpp runlist.cpp assoc.cpp pointer.cpp linked.cpp map.cpp \
-	cidr.cpp
-
-#LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
-
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/jni/libccrtp/Android.mk b/jni/libccrtp/Android.mk
new file mode 100644
index 0000000..ccf6054
--- /dev/null
+++ b/jni/libccrtp/Android.mk
@@ -0,0 +1,68 @@
+include $(CLEAR_VARS)
+
+MY_LOCAL_PATH := libccrtp/sources
+MY_COMMONCPP := commoncpp2-android/sources
+MY_OPENSSL := libopenssl
+
+LT_VERSION = 
+LT_RELEASE = 
+SHARED_FLAGS = "-no-undefined"
+SRTP_OPENSSL =
+SRTP_GCRYPT =
+
+#LOCAL_CPPFLAGS   += -Wno-psabi -frtti -pthread -fexceptions
+LOCAL_CPPFLAGS   += -std=gnu++0x -fexceptions
+
+LOCAL_C_INCLUDES += $(MY_LOCAL_PATH)/src \
+					$(MY_COMMONCPP)/inc \
+					$(MY_COMMONCPP) \
+					$(MY_COMMONCPP)/src \
+		    		$(MY_OPENSSL)/include \
+					$(MY_OPENSSL)
+
+LOCAL_STATIC_LIBRARIES :=	libccgnu2 \
+							libcrypto
+
+LOCAL_MODULE     := libccrtp1
+
+LOCAL_SHARED_LIBRARIES += libssl_shared
+
+LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib \
+                    -L$(APP_PROJECT_PATH)/obj/local/armeabi \
+
+
+LOCAL_CPP_EXTENSION := .cxx .cpp
+
+SRTP_SRC_O = 	$(MY_LOCAL_PATH)/src/ccrtp/crypto/openssl/hmac.cpp \
+				$(MY_LOCAL_PATH)/src/ccrtp/crypto/openssl/AesSrtp.cxx \
+				$(MY_LOCAL_PATH)/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
+
+ifneq ($(SRTP_GCRYPT),)
+SRTP_SRC_G =    $(MY_LOCAL_PATH)/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx \
+				$(MY_LOCAL_PATH)/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx \
+				$(MY_LOCAL_PATH)/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
+endif
+
+SKEIN_SRCS = $(MY_LOCAL_PATH)/src/ccrtp/crypto/macSkein.cpp \
+        $(MY_LOCAL_PATH)/src/ccrtp/crypto/skein.c \
+        $(MY_LOCAL_PATH)/src/ccrtp/crypto/skein_block.c \
+        $(MY_LOCAL_PATH)/src/ccrtp/crypto/skeinApi.c
+
+LOCAL_SRC_FILES  := $(MY_LOCAL_PATH)/src/rtppkt.cpp \
+					$(MY_LOCAL_PATH)/src/rtcppkt.cpp \
+					$(MY_LOCAL_PATH)/src/source.cpp \
+					$(MY_LOCAL_PATH)/src/data.cpp \
+					$(MY_LOCAL_PATH)/src/incqueue.cpp \
+					$(MY_LOCAL_PATH)/src/outqueue.cpp \
+					$(MY_LOCAL_PATH)/src/queue.cpp \
+					$(MY_LOCAL_PATH)/src/control.cpp \
+					$(MY_LOCAL_PATH)/src/members.cpp \
+					$(MY_LOCAL_PATH)/src/socket.cpp \
+					$(MY_LOCAL_PATH)/src/duplex.cpp \
+					$(MY_LOCAL_PATH)/src/pool.cpp \
+					$(MY_LOCAL_PATH)/src/CryptoContext.cxx $(SRTP_SRC_G) $(SRTP_SRC_O) $(SKEIN_SRCS)
+
+
+#LOCAL_LDFLAGS    := -version-info $(LT_VERSION) -release $(LT_RELEASE) $(SHARED_FLAGS)
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/ccrtp-android/AUTHORS b/jni/libccrtp/sources/AUTHORS
similarity index 100%
rename from jni/ccrtp-android/AUTHORS
rename to jni/libccrtp/sources/AUTHORS
diff --git a/jni/ccrtp-android/COPYING b/jni/libccrtp/sources/COPYING
similarity index 100%
rename from jni/ccrtp-android/COPYING
rename to jni/libccrtp/sources/COPYING
diff --git a/jni/ccrtp-android/COPYING.addendum b/jni/libccrtp/sources/COPYING.addendum
similarity index 100%
rename from jni/ccrtp-android/COPYING.addendum
rename to jni/libccrtp/sources/COPYING.addendum
diff --git a/jni/ccrtp-android/ChangeLog b/jni/libccrtp/sources/ChangeLog
similarity index 100%
rename from jni/ccrtp-android/ChangeLog
rename to jni/libccrtp/sources/ChangeLog
diff --git a/jni/libsndfile/INSTALL b/jni/libccrtp/sources/INSTALL
similarity index 100%
copy from jni/libsndfile/INSTALL
copy to jni/libccrtp/sources/INSTALL
diff --git a/jni/ccrtp-android/Makefile b/jni/libccrtp/sources/Makefile
similarity index 100%
rename from jni/ccrtp-android/Makefile
rename to jni/libccrtp/sources/Makefile
diff --git a/jni/ccrtp-android/Makefile.am b/jni/libccrtp/sources/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/Makefile.am
rename to jni/libccrtp/sources/Makefile.am
diff --git a/jni/ccrtp-android/Makefile.in b/jni/libccrtp/sources/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/Makefile.in
rename to jni/libccrtp/sources/Makefile.in
diff --git a/jni/ccrtp-android/NEWS b/jni/libccrtp/sources/NEWS
similarity index 100%
rename from jni/ccrtp-android/NEWS
rename to jni/libccrtp/sources/NEWS
diff --git a/jni/ccrtp-android/README b/jni/libccrtp/sources/README
similarity index 100%
rename from jni/ccrtp-android/README
rename to jni/libccrtp/sources/README
diff --git a/jni/ccrtp-android/THANKS b/jni/libccrtp/sources/THANKS
similarity index 100%
rename from jni/ccrtp-android/THANKS
rename to jni/libccrtp/sources/THANKS
diff --git a/jni/ccrtp-android/TODO b/jni/libccrtp/sources/TODO
similarity index 100%
rename from jni/ccrtp-android/TODO
rename to jni/libccrtp/sources/TODO
diff --git a/jni/ccrtp-android/aclocal.m4 b/jni/libccrtp/sources/aclocal.m4
similarity index 100%
rename from jni/ccrtp-android/aclocal.m4
rename to jni/libccrtp/sources/aclocal.m4
diff --git a/jni/ccrtp-android/autoconf/config.guess b/jni/libccrtp/sources/autoconf/config.guess
similarity index 100%
rename from jni/ccrtp-android/autoconf/config.guess
rename to jni/libccrtp/sources/autoconf/config.guess
diff --git a/jni/ccrtp-android/autoconf/config.sub b/jni/libccrtp/sources/autoconf/config.sub
similarity index 100%
rename from jni/ccrtp-android/autoconf/config.sub
rename to jni/libccrtp/sources/autoconf/config.sub
diff --git a/jni/ccrtp-android/autoconf/install-sh b/jni/libccrtp/sources/autoconf/install-sh
similarity index 100%
rename from jni/ccrtp-android/autoconf/install-sh
rename to jni/libccrtp/sources/autoconf/install-sh
diff --git a/jni/ccrtp-android/autoconf/ltmain.sh b/jni/libccrtp/sources/autoconf/ltmain.sh
similarity index 100%
rename from jni/ccrtp-android/autoconf/ltmain.sh
rename to jni/libccrtp/sources/autoconf/ltmain.sh
diff --git a/jni/ccrtp-android/autoconf/missing b/jni/libccrtp/sources/autoconf/missing
similarity index 100%
rename from jni/ccrtp-android/autoconf/missing
rename to jni/libccrtp/sources/autoconf/missing
diff --git a/jni/ccrtp-android/autoconf/texinfo.tex b/jni/libccrtp/sources/autoconf/texinfo.tex
similarity index 100%
rename from jni/ccrtp-android/autoconf/texinfo.tex
rename to jni/libccrtp/sources/autoconf/texinfo.tex
diff --git a/jni/ccrtp-android/autogen.sh b/jni/libccrtp/sources/autogen.sh
similarity index 100%
rename from jni/ccrtp-android/autogen.sh
rename to jni/libccrtp/sources/autogen.sh
diff --git a/jni/ccrtp-android/autom4te.cache/output.0 b/jni/libccrtp/sources/autom4te.cache/output.0
similarity index 100%
rename from jni/ccrtp-android/autom4te.cache/output.0
rename to jni/libccrtp/sources/autom4te.cache/output.0
diff --git a/jni/ccrtp-android/autom4te.cache/output.1 b/jni/libccrtp/sources/autom4te.cache/output.1
similarity index 100%
rename from jni/ccrtp-android/autom4te.cache/output.1
rename to jni/libccrtp/sources/autom4te.cache/output.1
diff --git a/jni/ccrtp-android/autom4te.cache/requests b/jni/libccrtp/sources/autom4te.cache/requests
similarity index 100%
rename from jni/ccrtp-android/autom4te.cache/requests
rename to jni/libccrtp/sources/autom4te.cache/requests
diff --git a/jni/ccrtp-android/autom4te.cache/traces.0 b/jni/libccrtp/sources/autom4te.cache/traces.0
similarity index 100%
rename from jni/ccrtp-android/autom4te.cache/traces.0
rename to jni/libccrtp/sources/autom4te.cache/traces.0
diff --git a/jni/ccrtp-android/autom4te.cache/traces.1 b/jni/libccrtp/sources/autom4te.cache/traces.1
similarity index 100%
rename from jni/ccrtp-android/autom4te.cache/traces.1
rename to jni/libccrtp/sources/autom4te.cache/traces.1
diff --git a/jni/ccrtp-android/ccrtp.list b/jni/libccrtp/sources/ccrtp.list
similarity index 100%
rename from jni/ccrtp-android/ccrtp.list
rename to jni/libccrtp/sources/ccrtp.list
diff --git a/jni/ccrtp-android/ccrtp.list.in b/jni/libccrtp/sources/ccrtp.list.in
similarity index 100%
rename from jni/ccrtp-android/ccrtp.list.in
rename to jni/libccrtp/sources/ccrtp.list.in
diff --git a/jni/ccrtp-android/ccrtp.spec b/jni/libccrtp/sources/ccrtp.spec
similarity index 100%
rename from jni/ccrtp-android/ccrtp.spec
rename to jni/libccrtp/sources/ccrtp.spec
diff --git a/jni/ccrtp-android/ccrtp.spec.in b/jni/libccrtp/sources/ccrtp.spec.in
similarity index 100%
rename from jni/ccrtp-android/ccrtp.spec.in
rename to jni/libccrtp/sources/ccrtp.spec.in
diff --git a/jni/ccrtp-android/config.log b/jni/libccrtp/sources/config.log
similarity index 100%
rename from jni/ccrtp-android/config.log
rename to jni/libccrtp/sources/config.log
diff --git a/jni/ccrtp-android/config.status b/jni/libccrtp/sources/config.status
similarity index 100%
rename from jni/ccrtp-android/config.status
rename to jni/libccrtp/sources/config.status
diff --git a/jni/ccrtp-android/configure b/jni/libccrtp/sources/configure
similarity index 100%
rename from jni/ccrtp-android/configure
rename to jni/libccrtp/sources/configure
diff --git a/jni/ccrtp-android/configure.ac b/jni/libccrtp/sources/configure.ac
similarity index 100%
rename from jni/ccrtp-android/configure.ac
rename to jni/libccrtp/sources/configure.ac
diff --git a/jni/ccrtp-android/demo/Makefile b/jni/libccrtp/sources/demo/Makefile
similarity index 100%
rename from jni/ccrtp-android/demo/Makefile
rename to jni/libccrtp/sources/demo/Makefile
diff --git a/jni/ccrtp-android/demo/Makefile.am b/jni/libccrtp/sources/demo/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/demo/Makefile.am
rename to jni/libccrtp/sources/demo/Makefile.am
diff --git a/jni/ccrtp-android/demo/Makefile.in b/jni/libccrtp/sources/demo/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/demo/Makefile.in
rename to jni/libccrtp/sources/demo/Makefile.in
diff --git a/jni/ccrtp-android/demo/README b/jni/libccrtp/sources/demo/README
similarity index 100%
rename from jni/ccrtp-android/demo/README
rename to jni/libccrtp/sources/demo/README
diff --git a/jni/ccrtp-android/demo/audio.h b/jni/libccrtp/sources/demo/audio.h
similarity index 100%
rename from jni/ccrtp-android/demo/audio.h
rename to jni/libccrtp/sources/demo/audio.h
diff --git a/jni/ccrtp-android/demo/audiorx.cpp b/jni/libccrtp/sources/demo/audiorx.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/audiorx.cpp
rename to jni/libccrtp/sources/demo/audiorx.cpp
diff --git a/jni/ccrtp-android/demo/audiotx.cpp b/jni/libccrtp/sources/demo/audiotx.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/audiotx.cpp
rename to jni/libccrtp/sources/demo/audiotx.cpp
diff --git a/jni/ccrtp-android/demo/ccrtptest.cpp b/jni/libccrtp/sources/demo/ccrtptest.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/ccrtptest.cpp
rename to jni/libccrtp/sources/demo/ccrtptest.cpp
diff --git a/jni/ccrtp-android/demo/ccsrtptest.cpp b/jni/libccrtp/sources/demo/ccsrtptest.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/ccsrtptest.cpp
rename to jni/libccrtp/sources/demo/ccsrtptest.cpp
diff --git a/jni/ccrtp-android/demo/rtpduphello.cpp b/jni/libccrtp/sources/demo/rtpduphello.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/rtpduphello.cpp
rename to jni/libccrtp/sources/demo/rtpduphello.cpp
diff --git a/jni/ccrtp-android/demo/rtphello.cpp b/jni/libccrtp/sources/demo/rtphello.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/rtphello.cpp
rename to jni/libccrtp/sources/demo/rtphello.cpp
diff --git a/jni/ccrtp-android/demo/rtplisten.cpp b/jni/libccrtp/sources/demo/rtplisten.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/rtplisten.cpp
rename to jni/libccrtp/sources/demo/rtplisten.cpp
diff --git a/jni/ccrtp-android/demo/rtpsend.cpp b/jni/libccrtp/sources/demo/rtpsend.cpp
similarity index 100%
rename from jni/ccrtp-android/demo/rtpsend.cpp
rename to jni/libccrtp/sources/demo/rtpsend.cpp
diff --git a/jni/ccrtp-android/doc/Doxyfile b/jni/libccrtp/sources/doc/Doxyfile
similarity index 100%
rename from jni/ccrtp-android/doc/Doxyfile
rename to jni/libccrtp/sources/doc/Doxyfile
diff --git a/jni/ccrtp-android/doc/Doxymini b/jni/libccrtp/sources/doc/Doxymini
similarity index 100%
rename from jni/ccrtp-android/doc/Doxymini
rename to jni/libccrtp/sources/doc/Doxymini
diff --git a/jni/ccrtp-android/doc/Makefile b/jni/libccrtp/sources/doc/Makefile
similarity index 100%
rename from jni/ccrtp-android/doc/Makefile
rename to jni/libccrtp/sources/doc/Makefile
diff --git a/jni/ccrtp-android/doc/Makefile.am b/jni/libccrtp/sources/doc/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/doc/Makefile.am
rename to jni/libccrtp/sources/doc/Makefile.am
diff --git a/jni/ccrtp-android/doc/Makefile.in b/jni/libccrtp/sources/doc/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/doc/Makefile.in
rename to jni/libccrtp/sources/doc/Makefile.in
diff --git a/jni/ccrtp-android/doc/ccrtp.info b/jni/libccrtp/sources/doc/ccrtp.info
similarity index 100%
rename from jni/ccrtp-android/doc/ccrtp.info
rename to jni/libccrtp/sources/doc/ccrtp.info
Binary files differ
diff --git a/jni/ccrtp-android/doc/ccrtp.texi b/jni/libccrtp/sources/doc/ccrtp.texi
similarity index 100%
rename from jni/ccrtp-android/doc/ccrtp.texi
rename to jni/libccrtp/sources/doc/ccrtp.texi
diff --git a/jni/libzrtp/doc/fdl.texi b/jni/libccrtp/sources/doc/fdl.texi
similarity index 100%
copy from jni/libzrtp/doc/fdl.texi
copy to jni/libccrtp/sources/doc/fdl.texi
diff --git a/jni/libzrtp/doc/fdlnotice.texi b/jni/libccrtp/sources/doc/fdlnotice.texi
similarity index 100%
copy from jni/libzrtp/doc/fdlnotice.texi
copy to jni/libccrtp/sources/doc/fdlnotice.texi
diff --git a/jni/libzrtp/doc/gpl.texi b/jni/libccrtp/sources/doc/gpl.texi
similarity index 100%
copy from jni/libzrtp/doc/gpl.texi
copy to jni/libccrtp/sources/doc/gpl.texi
diff --git a/jni/ccrtp-android/doc/srcmodel.dia b/jni/libccrtp/sources/doc/srcmodel.dia
similarity index 100%
rename from jni/ccrtp-android/doc/srcmodel.dia
rename to jni/libccrtp/sources/doc/srcmodel.dia
Binary files differ
diff --git a/jni/ccrtp-android/doc/srcmodel.txt b/jni/libccrtp/sources/doc/srcmodel.txt
similarity index 100%
rename from jni/ccrtp-android/doc/srcmodel.txt
rename to jni/libccrtp/sources/doc/srcmodel.txt
diff --git a/jni/ccrtp-android/envsetup.sh b/jni/libccrtp/sources/envsetup.sh
similarity index 100%
rename from jni/ccrtp-android/envsetup.sh
rename to jni/libccrtp/sources/envsetup.sh
diff --git a/jni/ccrtp-android/libccrtp.spec b/jni/libccrtp/sources/libccrtp.spec
similarity index 100%
rename from jni/ccrtp-android/libccrtp.spec
rename to jni/libccrtp/sources/libccrtp.spec
diff --git a/jni/ccrtp-android/libccrtp.spec.in b/jni/libccrtp/sources/libccrtp.spec.in
similarity index 100%
rename from jni/ccrtp-android/libccrtp.spec.in
rename to jni/libccrtp/sources/libccrtp.spec.in
diff --git a/jni/ccrtp-android/libccrtp1.pc b/jni/libccrtp/sources/libccrtp1.pc
similarity index 100%
rename from jni/ccrtp-android/libccrtp1.pc
rename to jni/libccrtp/sources/libccrtp1.pc
diff --git a/jni/ccrtp-android/libccrtp1.pc.in b/jni/libccrtp/sources/libccrtp1.pc.in
similarity index 100%
rename from jni/ccrtp-android/libccrtp1.pc.in
rename to jni/libccrtp/sources/libccrtp1.pc.in
diff --git a/jni/ccrtp-android/libtool b/jni/libccrtp/sources/libtool
similarity index 100%
rename from jni/ccrtp-android/libtool
rename to jni/libccrtp/sources/libtool
diff --git a/jni/ccrtp-android/m4/Makefile b/jni/libccrtp/sources/m4/Makefile
similarity index 100%
rename from jni/ccrtp-android/m4/Makefile
rename to jni/libccrtp/sources/m4/Makefile
diff --git a/jni/ccrtp-android/m4/Makefile.am b/jni/libccrtp/sources/m4/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/m4/Makefile.am
rename to jni/libccrtp/sources/m4/Makefile.am
diff --git a/jni/ccrtp-android/m4/Makefile.in b/jni/libccrtp/sources/m4/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/m4/Makefile.in
rename to jni/libccrtp/sources/m4/Makefile.in
diff --git a/jni/ccrtp-android/m4/libgcrypt_local.m4 b/jni/libccrtp/sources/m4/libgcrypt_local.m4
similarity index 100%
rename from jni/ccrtp-android/m4/libgcrypt_local.m4
rename to jni/libccrtp/sources/m4/libgcrypt_local.m4
diff --git a/jni/libsamplerate/M4/libtool.m4 b/jni/libccrtp/sources/m4/libtool.m4
similarity index 100%
copy from jni/libsamplerate/M4/libtool.m4
copy to jni/libccrtp/sources/m4/libtool.m4
diff --git a/jni/libsamplerate/M4/ltoptions.m4 b/jni/libccrtp/sources/m4/ltoptions.m4
similarity index 100%
copy from jni/libsamplerate/M4/ltoptions.m4
copy to jni/libccrtp/sources/m4/ltoptions.m4
diff --git a/jni/libopus/m4/ltsugar.m4 b/jni/libccrtp/sources/m4/ltsugar.m4
similarity index 100%
copy from jni/libopus/m4/ltsugar.m4
copy to jni/libccrtp/sources/m4/ltsugar.m4
diff --git a/jni/libsamplerate/M4/ltversion.m4 b/jni/libccrtp/sources/m4/ltversion.m4
similarity index 100%
copy from jni/libsamplerate/M4/ltversion.m4
copy to jni/libccrtp/sources/m4/ltversion.m4
diff --git a/jni/libopus/m4/lt~obsolete.m4 b/jni/libccrtp/sources/m4/lt~obsolete.m4
similarity index 100%
copy from jni/libopus/m4/lt~obsolete.m4
copy to jni/libccrtp/sources/m4/lt~obsolete.m4
diff --git a/jni/ccrtp-android/m4/ost_debug.m4 b/jni/libccrtp/sources/m4/ost_debug.m4
similarity index 100%
rename from jni/ccrtp-android/m4/ost_debug.m4
rename to jni/libccrtp/sources/m4/ost_debug.m4
diff --git a/jni/ccrtp-android/m4/ost_maint.m4 b/jni/libccrtp/sources/m4/ost_maint.m4
similarity index 100%
rename from jni/ccrtp-android/m4/ost_maint.m4
rename to jni/libccrtp/sources/m4/ost_maint.m4
diff --git a/jni/ccrtp-android/m4/ost_prog.m4 b/jni/libccrtp/sources/m4/ost_prog.m4
similarity index 100%
rename from jni/ccrtp-android/m4/ost_prog.m4
rename to jni/libccrtp/sources/m4/ost_prog.m4
diff --git a/jni/ccrtp-android/phone/Makefile b/jni/libccrtp/sources/phone/Makefile
similarity index 100%
rename from jni/ccrtp-android/phone/Makefile
rename to jni/libccrtp/sources/phone/Makefile
diff --git a/jni/ccrtp-android/phone/Makefile.am b/jni/libccrtp/sources/phone/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/phone/Makefile.am
rename to jni/libccrtp/sources/phone/Makefile.am
diff --git a/jni/ccrtp-android/phone/Makefile.in b/jni/libccrtp/sources/phone/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/phone/Makefile.in
rename to jni/libccrtp/sources/phone/Makefile.in
diff --git a/jni/ccrtp-android/phone/config.cpp b/jni/libccrtp/sources/phone/config.cpp
similarity index 100%
rename from jni/ccrtp-android/phone/config.cpp
rename to jni/libccrtp/sources/phone/config.cpp
diff --git a/jni/ccrtp-android/phone/phone.conf b/jni/libccrtp/sources/phone/phone.conf
similarity index 100%
rename from jni/ccrtp-android/phone/phone.conf
rename to jni/libccrtp/sources/phone/phone.conf
diff --git a/jni/ccrtp-android/phone/phone.cpp b/jni/libccrtp/sources/phone/phone.cpp
similarity index 100%
rename from jni/ccrtp-android/phone/phone.cpp
rename to jni/libccrtp/sources/phone/phone.cpp
diff --git a/jni/ccrtp-android/phone/phone.h b/jni/libccrtp/sources/phone/phone.h
similarity index 100%
rename from jni/ccrtp-android/phone/phone.h
rename to jni/libccrtp/sources/phone/phone.h
diff --git a/jni/ccrtp-android/phone/rtp.cpp b/jni/libccrtp/sources/phone/rtp.cpp
similarity index 100%
rename from jni/ccrtp-android/phone/rtp.cpp
rename to jni/libccrtp/sources/phone/rtp.cpp
diff --git a/jni/ccrtp-android/phone/server.cpp b/jni/libccrtp/sources/phone/server.cpp
similarity index 100%
rename from jni/ccrtp-android/phone/server.cpp
rename to jni/libccrtp/sources/phone/server.cpp
diff --git a/jni/ccrtp-android/phone/server.h b/jni/libccrtp/sources/phone/server.h
similarity index 100%
rename from jni/ccrtp-android/phone/server.h
rename to jni/libccrtp/sources/phone/server.h
diff --git a/jni/ccrtp-android/src/CryptoContext.cxx b/jni/libccrtp/sources/src/CryptoContext.cxx
similarity index 100%
rename from jni/ccrtp-android/src/CryptoContext.cxx
rename to jni/libccrtp/sources/src/CryptoContext.cxx
diff --git a/jni/ccrtp-android/src/Makefile b/jni/libccrtp/sources/src/Makefile
similarity index 100%
rename from jni/ccrtp-android/src/Makefile
rename to jni/libccrtp/sources/src/Makefile
diff --git a/jni/ccrtp-android/src/Makefile.am b/jni/libccrtp/sources/src/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/src/Makefile.am
rename to jni/libccrtp/sources/src/Makefile.am
diff --git a/jni/ccrtp-android/src/Makefile.in b/jni/libccrtp/sources/src/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/src/Makefile.in
rename to jni/libccrtp/sources/src/Makefile.in
diff --git a/jni/ccrtp-android/src/ccrtp/CryptoContext.h b/jni/libccrtp/sources/src/ccrtp/CryptoContext.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/CryptoContext.h
rename to jni/libccrtp/sources/src/ccrtp/CryptoContext.h
diff --git a/jni/ccrtp-android/src/ccrtp/Makefile b/jni/libccrtp/sources/src/ccrtp/Makefile
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/Makefile
rename to jni/libccrtp/sources/src/ccrtp/Makefile
diff --git a/jni/ccrtp-android/src/ccrtp/Makefile.am b/jni/libccrtp/sources/src/ccrtp/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/Makefile.am
rename to jni/libccrtp/sources/src/ccrtp/Makefile.am
diff --git a/jni/ccrtp-android/src/ccrtp/Makefile.in b/jni/libccrtp/sources/src/ccrtp/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/Makefile.in
rename to jni/libccrtp/sources/src/ccrtp/Makefile.in
diff --git a/jni/ccrtp-android/src/ccrtp/base.h b/jni/libccrtp/sources/src/ccrtp/base.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/base.h
rename to jni/libccrtp/sources/src/ccrtp/base.h
diff --git a/jni/ccrtp-android/src/ccrtp/channel.h b/jni/libccrtp/sources/src/ccrtp/channel.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/channel.h
rename to jni/libccrtp/sources/src/ccrtp/channel.h
diff --git a/jni/ccrtp-android/src/ccrtp/cqueue.h b/jni/libccrtp/sources/src/ccrtp/cqueue.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/cqueue.h
rename to jni/libccrtp/sources/src/ccrtp/cqueue.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/AesSrtp.h b/jni/libccrtp/sources/src/ccrtp/crypto/AesSrtp.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/AesSrtp.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/AesSrtp.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/Makefile b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/Makefile
rename to jni/libccrtp/sources/src/ccrtp/crypto/Makefile
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/Makefile.am b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/Makefile.am
rename to jni/libccrtp/sources/src/ccrtp/crypto/Makefile.am
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/Makefile.in b/jni/libccrtp/sources/src/ccrtp/crypto/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/Makefile.in
rename to jni/libccrtp/sources/src/ccrtp/crypto/Makefile.in
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/brg_endian.h b/jni/libccrtp/sources/src/ccrtp/crypto/brg_endian.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/brg_endian.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/brg_endian.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/brg_types.h b/jni/libccrtp/sources/src/ccrtp/crypto/brg_types.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/brg_types.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/brg_types.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx b/jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
rename to jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/InitializeGcrypt.cxx
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx b/jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx
rename to jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/gcryptAesSrtp.cxx
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx b/jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx
rename to jni/libccrtp/sources/src/ccrtp/crypto/gcrypt/gcrypthmac.cxx
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/hmac.h b/jni/libccrtp/sources/src/ccrtp/crypto/hmac.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/hmac.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/hmac.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/macSkein.cpp b/jni/libccrtp/sources/src/ccrtp/crypto/macSkein.cpp
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/macSkein.cpp
rename to jni/libccrtp/sources/src/ccrtp/crypto/macSkein.cpp
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/macSkein.h b/jni/libccrtp/sources/src/ccrtp/crypto/macSkein.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/macSkein.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/macSkein.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/openssl/AesSrtp.cxx b/jni/libccrtp/sources/src/ccrtp/crypto/openssl/AesSrtp.cxx
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/openssl/AesSrtp.cxx
rename to jni/libccrtp/sources/src/ccrtp/crypto/openssl/AesSrtp.cxx
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx b/jni/libccrtp/sources/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
rename to jni/libccrtp/sources/src/ccrtp/crypto/openssl/InitializeOpenSSL.cxx
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/openssl/hmac.cpp b/jni/libccrtp/sources/src/ccrtp/crypto/openssl/hmac.cpp
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/openssl/hmac.cpp
rename to jni/libccrtp/sources/src/ccrtp/crypto/openssl/hmac.cpp
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/skein.c b/jni/libccrtp/sources/src/ccrtp/crypto/skein.c
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/skein.c
rename to jni/libccrtp/sources/src/ccrtp/crypto/skein.c
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/skein.h b/jni/libccrtp/sources/src/ccrtp/crypto/skein.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/skein.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/skein.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/skeinApi.c b/jni/libccrtp/sources/src/ccrtp/crypto/skeinApi.c
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/skeinApi.c
rename to jni/libccrtp/sources/src/ccrtp/crypto/skeinApi.c
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/skeinApi.h b/jni/libccrtp/sources/src/ccrtp/crypto/skeinApi.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/skeinApi.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/skeinApi.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/skein_block.c b/jni/libccrtp/sources/src/ccrtp/crypto/skein_block.c
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/skein_block.c
rename to jni/libccrtp/sources/src/ccrtp/crypto/skein_block.c
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/skein_iv.h b/jni/libccrtp/sources/src/ccrtp/crypto/skein_iv.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/skein_iv.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/skein_iv.h
diff --git a/jni/ccrtp-android/src/ccrtp/crypto/skein_port.h b/jni/libccrtp/sources/src/ccrtp/crypto/skein_port.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/crypto/skein_port.h
rename to jni/libccrtp/sources/src/ccrtp/crypto/skein_port.h
diff --git a/jni/ccrtp-android/src/ccrtp/ext.h b/jni/libccrtp/sources/src/ccrtp/ext.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/ext.h
rename to jni/libccrtp/sources/src/ccrtp/ext.h
diff --git a/jni/ccrtp-android/src/ccrtp/formats.h b/jni/libccrtp/sources/src/ccrtp/formats.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/formats.h
rename to jni/libccrtp/sources/src/ccrtp/formats.h
diff --git a/jni/ccrtp-android/src/ccrtp/ioqueue.h b/jni/libccrtp/sources/src/ccrtp/ioqueue.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/ioqueue.h
rename to jni/libccrtp/sources/src/ccrtp/ioqueue.h
diff --git a/jni/ccrtp-android/src/ccrtp/iqueue.h b/jni/libccrtp/sources/src/ccrtp/iqueue.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/iqueue.h
rename to jni/libccrtp/sources/src/ccrtp/iqueue.h
diff --git a/jni/ccrtp-android/src/ccrtp/oqueue.h b/jni/libccrtp/sources/src/ccrtp/oqueue.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/oqueue.h
rename to jni/libccrtp/sources/src/ccrtp/oqueue.h
diff --git a/jni/ccrtp-android/src/ccrtp/pool.h b/jni/libccrtp/sources/src/ccrtp/pool.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/pool.h
rename to jni/libccrtp/sources/src/ccrtp/pool.h
diff --git a/jni/ccrtp-android/src/ccrtp/queuebase.h b/jni/libccrtp/sources/src/ccrtp/queuebase.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/queuebase.h
rename to jni/libccrtp/sources/src/ccrtp/queuebase.h
diff --git a/jni/ccrtp-android/src/ccrtp/rtcppkt.h b/jni/libccrtp/sources/src/ccrtp/rtcppkt.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/rtcppkt.h
rename to jni/libccrtp/sources/src/ccrtp/rtcppkt.h
diff --git a/jni/ccrtp-android/src/ccrtp/rtp.h b/jni/libccrtp/sources/src/ccrtp/rtp.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/rtp.h
rename to jni/libccrtp/sources/src/ccrtp/rtp.h
diff --git a/jni/ccrtp-android/src/ccrtp/rtppkt.h b/jni/libccrtp/sources/src/ccrtp/rtppkt.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/rtppkt.h
rename to jni/libccrtp/sources/src/ccrtp/rtppkt.h
diff --git a/jni/ccrtp-android/src/ccrtp/sources.h b/jni/libccrtp/sources/src/ccrtp/sources.h
similarity index 100%
rename from jni/ccrtp-android/src/ccrtp/sources.h
rename to jni/libccrtp/sources/src/ccrtp/sources.h
diff --git a/jni/ccrtp-android/src/config.h b/jni/libccrtp/sources/src/config.h
similarity index 100%
rename from jni/ccrtp-android/src/config.h
rename to jni/libccrtp/sources/src/config.h
diff --git a/jni/ccrtp-android/src/config.h.in b/jni/libccrtp/sources/src/config.h.in
similarity index 100%
rename from jni/ccrtp-android/src/config.h.in
rename to jni/libccrtp/sources/src/config.h.in
diff --git a/jni/ccrtp-android/src/control.cpp b/jni/libccrtp/sources/src/control.cpp
similarity index 100%
rename from jni/ccrtp-android/src/control.cpp
rename to jni/libccrtp/sources/src/control.cpp
diff --git a/jni/ccrtp-android/src/data.cpp b/jni/libccrtp/sources/src/data.cpp
similarity index 100%
rename from jni/ccrtp-android/src/data.cpp
rename to jni/libccrtp/sources/src/data.cpp
diff --git a/jni/ccrtp-android/src/duplex.cpp b/jni/libccrtp/sources/src/duplex.cpp
similarity index 100%
rename from jni/ccrtp-android/src/duplex.cpp
rename to jni/libccrtp/sources/src/duplex.cpp
diff --git a/jni/ccrtp-android/src/incqueue.cpp b/jni/libccrtp/sources/src/incqueue.cpp
similarity index 100%
rename from jni/ccrtp-android/src/incqueue.cpp
rename to jni/libccrtp/sources/src/incqueue.cpp
diff --git a/jni/ccrtp-android/src/members.cpp b/jni/libccrtp/sources/src/members.cpp
similarity index 100%
rename from jni/ccrtp-android/src/members.cpp
rename to jni/libccrtp/sources/src/members.cpp
diff --git a/jni/ccrtp-android/src/outqueue.cpp b/jni/libccrtp/sources/src/outqueue.cpp
similarity index 100%
rename from jni/ccrtp-android/src/outqueue.cpp
rename to jni/libccrtp/sources/src/outqueue.cpp
diff --git a/jni/ccrtp-android/src/pool.cpp b/jni/libccrtp/sources/src/pool.cpp
similarity index 100%
rename from jni/ccrtp-android/src/pool.cpp
rename to jni/libccrtp/sources/src/pool.cpp
diff --git a/jni/ccrtp-android/src/private.h b/jni/libccrtp/sources/src/private.h
similarity index 100%
rename from jni/ccrtp-android/src/private.h
rename to jni/libccrtp/sources/src/private.h
diff --git a/jni/ccrtp-android/src/queue.cpp b/jni/libccrtp/sources/src/queue.cpp
similarity index 100%
rename from jni/ccrtp-android/src/queue.cpp
rename to jni/libccrtp/sources/src/queue.cpp
diff --git a/jni/ccrtp-android/src/rtcppkt.cpp b/jni/libccrtp/sources/src/rtcppkt.cpp
similarity index 100%
rename from jni/ccrtp-android/src/rtcppkt.cpp
rename to jni/libccrtp/sources/src/rtcppkt.cpp
diff --git a/jni/ccrtp-android/src/rtppkt.cpp b/jni/libccrtp/sources/src/rtppkt.cpp
similarity index 100%
rename from jni/ccrtp-android/src/rtppkt.cpp
rename to jni/libccrtp/sources/src/rtppkt.cpp
diff --git a/jni/ccrtp-android/src/socket.cpp b/jni/libccrtp/sources/src/socket.cpp
similarity index 100%
rename from jni/ccrtp-android/src/socket.cpp
rename to jni/libccrtp/sources/src/socket.cpp
diff --git a/jni/ccrtp-android/src/source.cpp b/jni/libccrtp/sources/src/source.cpp
similarity index 100%
rename from jni/ccrtp-android/src/source.cpp
rename to jni/libccrtp/sources/src/source.cpp
diff --git a/jni/libsndfile/src/stamp-h1 b/jni/libccrtp/sources/src/stamp-h1
similarity index 100%
copy from jni/libsndfile/src/stamp-h1
copy to jni/libccrtp/sources/src/stamp-h1
diff --git a/jni/ccrtp-android/w32/Makefile b/jni/libccrtp/sources/w32/Makefile
similarity index 100%
rename from jni/ccrtp-android/w32/Makefile
rename to jni/libccrtp/sources/w32/Makefile
diff --git a/jni/ccrtp-android/w32/Makefile.am b/jni/libccrtp/sources/w32/Makefile.am
similarity index 100%
rename from jni/ccrtp-android/w32/Makefile.am
rename to jni/libccrtp/sources/w32/Makefile.am
diff --git a/jni/ccrtp-android/w32/Makefile.in b/jni/libccrtp/sources/w32/Makefile.in
similarity index 100%
rename from jni/ccrtp-android/w32/Makefile.in
rename to jni/libccrtp/sources/w32/Makefile.in
diff --git a/jni/ccrtp-android/w32/README b/jni/libccrtp/sources/w32/README
similarity index 100%
rename from jni/ccrtp-android/w32/README
rename to jni/libccrtp/sources/w32/README
diff --git a/jni/ccrtp-android/w32/cape/ccrtp1.dsp b/jni/libccrtp/sources/w32/cape/ccrtp1.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/cape/ccrtp1.dsp
rename to jni/libccrtp/sources/w32/cape/ccrtp1.dsp
diff --git a/jni/ccrtp-android/w32/cape/ccrtp1.dsw b/jni/libccrtp/sources/w32/cape/ccrtp1.dsw
similarity index 100%
rename from jni/ccrtp-android/w32/cape/ccrtp1.dsw
rename to jni/libccrtp/sources/w32/cape/ccrtp1.dsw
diff --git a/jni/ccrtp-android/w32/cape/ccrtp1.sln b/jni/libccrtp/sources/w32/cape/ccrtp1.sln
similarity index 100%
rename from jni/ccrtp-android/w32/cape/ccrtp1.sln
rename to jni/libccrtp/sources/w32/cape/ccrtp1.sln
diff --git a/jni/ccrtp-android/w32/cape/ccrtp1.vcproj b/jni/libccrtp/sources/w32/cape/ccrtp1.vcproj
similarity index 100%
rename from jni/ccrtp-android/w32/cape/ccrtp1.vcproj
rename to jni/libccrtp/sources/w32/cape/ccrtp1.vcproj
diff --git a/jni/ccrtp-android/w32/cape/rtphello.dsp b/jni/libccrtp/sources/w32/cape/rtphello.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/cape/rtphello.dsp
rename to jni/libccrtp/sources/w32/cape/rtphello.dsp
diff --git a/jni/ccrtp-android/w32/cape/rtphello.vcproj b/jni/libccrtp/sources/w32/cape/rtphello.vcproj
similarity index 100%
rename from jni/ccrtp-android/w32/cape/rtphello.vcproj
rename to jni/libccrtp/sources/w32/cape/rtphello.vcproj
diff --git a/jni/ccrtp-android/w32/cape/rtplisten.dsp b/jni/libccrtp/sources/w32/cape/rtplisten.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/cape/rtplisten.dsp
rename to jni/libccrtp/sources/w32/cape/rtplisten.dsp
diff --git a/jni/ccrtp-android/w32/cape/rtplisten.vcproj b/jni/libccrtp/sources/w32/cape/rtplisten.vcproj
similarity index 100%
rename from jni/ccrtp-android/w32/cape/rtplisten.vcproj
rename to jni/libccrtp/sources/w32/cape/rtplisten.vcproj
diff --git a/jni/ccrtp-android/w32/cape/rtpsend.dsp b/jni/libccrtp/sources/w32/cape/rtpsend.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/cape/rtpsend.dsp
rename to jni/libccrtp/sources/w32/cape/rtpsend.dsp
diff --git a/jni/ccrtp-android/w32/cape/rtpsend.vcproj b/jni/libccrtp/sources/w32/cape/rtpsend.vcproj
similarity index 100%
rename from jni/ccrtp-android/w32/cape/rtpsend.vcproj
rename to jni/libccrtp/sources/w32/cape/rtpsend.vcproj
diff --git a/jni/ccrtp-android/w32/common/ccext2.dsp b/jni/libccrtp/sources/w32/common/ccext2.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/common/ccext2.dsp
rename to jni/libccrtp/sources/w32/common/ccext2.dsp
diff --git a/jni/ccrtp-android/w32/common/ccgnu2.dsp b/jni/libccrtp/sources/w32/common/ccgnu2.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/common/ccgnu2.dsp
rename to jni/libccrtp/sources/w32/common/ccgnu2.dsp
diff --git a/jni/ccrtp-android/w32/mingw32/Makefile.gcc b/jni/libccrtp/sources/w32/mingw32/Makefile.gcc
similarity index 100%
rename from jni/ccrtp-android/w32/mingw32/Makefile.gcc
rename to jni/libccrtp/sources/w32/mingw32/Makefile.gcc
diff --git a/jni/ccrtp-android/w32/msvcpp/ccRTPdemo.dsw b/jni/libccrtp/sources/w32/msvcpp/ccRTPdemo.dsw
similarity index 100%
rename from jni/ccrtp-android/w32/msvcpp/ccRTPdemo.dsw
rename to jni/libccrtp/sources/w32/msvcpp/ccRTPdemo.dsw
diff --git a/jni/ccrtp-android/w32/msvcpp/ccrtp1.dsp b/jni/libccrtp/sources/w32/msvcpp/ccrtp1.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/msvcpp/ccrtp1.dsp
rename to jni/libccrtp/sources/w32/msvcpp/ccrtp1.dsp
diff --git a/jni/ccrtp-android/w32/msvcpp/ccrtp1.dsw b/jni/libccrtp/sources/w32/msvcpp/ccrtp1.dsw
similarity index 100%
rename from jni/ccrtp-android/w32/msvcpp/ccrtp1.dsw
rename to jni/libccrtp/sources/w32/msvcpp/ccrtp1.dsw
diff --git a/jni/ccrtp-android/w32/msvcpp/demo/rtphello.dsp b/jni/libccrtp/sources/w32/msvcpp/demo/rtphello.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/msvcpp/demo/rtphello.dsp
rename to jni/libccrtp/sources/w32/msvcpp/demo/rtphello.dsp
diff --git a/jni/ccrtp-android/w32/msvcpp/demo/rtplisten.dsp b/jni/libccrtp/sources/w32/msvcpp/demo/rtplisten.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/msvcpp/demo/rtplisten.dsp
rename to jni/libccrtp/sources/w32/msvcpp/demo/rtplisten.dsp
diff --git a/jni/ccrtp-android/w32/msvcpp/demo/rtpsend.dsp b/jni/libccrtp/sources/w32/msvcpp/demo/rtpsend.dsp
similarity index 100%
rename from jni/ccrtp-android/w32/msvcpp/demo/rtpsend.dsp
rename to jni/libccrtp/sources/w32/msvcpp/demo/rtpsend.dsp
diff --git a/jni/libexpat/Android.mk b/jni/libexpat/Android.mk
index 5cf4130..0a6da07 100644
--- a/jni/libexpat/Android.mk
+++ b/jni/libexpat/Android.mk
@@ -1,21 +1,21 @@
-LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+MY_LIBEXPAT := libexpat/sources
 
 # We need to build this for both the device (as a shared library)
 # and the host (as a static library for tools to use).
 
-$(warning Android.mk -> $(LOCAL_PATH))
-
-common_SRC_FILES := \
-	xmlparse.c \
-	xmlrole.c \
-	xmltok.c
+common_SRC_FILES := $(MY_LIBEXPAT)/xmlparse.c \
+					$(MY_LIBEXPAT)/xmlrole.c \
+					$(MY_LIBEXPAT)/xmltok.c
 
 common_CFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H
 
-#common_C_INCLUDES += $(LOCAL_PATH)/../lib \
-#                     $(LOCAL_PATH)/..
+common_C_INCLUDES += $(MY_LIBEXPAT)
 
 common_COPY_HEADERS_TO := libexpat
+
 common_COPY_HEADERS := \
 	lib/expat.h \
 	lib/expat_external.h
diff --git a/jni/libexpat/Makefile.MPW b/jni/libexpat/sources/Makefile.MPW
similarity index 100%
rename from jni/libexpat/Makefile.MPW
rename to jni/libexpat/sources/Makefile.MPW
diff --git a/jni/libexpat/amigaconfig.h b/jni/libexpat/sources/amigaconfig.h
similarity index 100%
rename from jni/libexpat/amigaconfig.h
rename to jni/libexpat/sources/amigaconfig.h
diff --git a/jni/libexpat/ascii.h b/jni/libexpat/sources/ascii.h
similarity index 100%
rename from jni/libexpat/ascii.h
rename to jni/libexpat/sources/ascii.h
diff --git a/jni/libexpat/asciitab.h b/jni/libexpat/sources/asciitab.h
similarity index 100%
rename from jni/libexpat/asciitab.h
rename to jni/libexpat/sources/asciitab.h
diff --git a/jni/libexpat/expat.dsp b/jni/libexpat/sources/expat.dsp
similarity index 100%
rename from jni/libexpat/expat.dsp
rename to jni/libexpat/sources/expat.dsp
diff --git a/jni/libexpat/expat.h b/jni/libexpat/sources/expat.h
similarity index 100%
rename from jni/libexpat/expat.h
rename to jni/libexpat/sources/expat.h
diff --git a/jni/libexpat/expat_config.h b/jni/libexpat/sources/expat_config.h
similarity index 100%
rename from jni/libexpat/expat_config.h
rename to jni/libexpat/sources/expat_config.h
diff --git a/jni/libexpat/expat_external.h b/jni/libexpat/sources/expat_external.h
similarity index 100%
rename from jni/libexpat/expat_external.h
rename to jni/libexpat/sources/expat_external.h
diff --git a/jni/libexpat/expat_static.dsp b/jni/libexpat/sources/expat_static.dsp
similarity index 100%
rename from jni/libexpat/expat_static.dsp
rename to jni/libexpat/sources/expat_static.dsp
diff --git a/jni/libexpat/expatw.dsp b/jni/libexpat/sources/expatw.dsp
similarity index 100%
rename from jni/libexpat/expatw.dsp
rename to jni/libexpat/sources/expatw.dsp
diff --git a/jni/libexpat/expatw_static.dsp b/jni/libexpat/sources/expatw_static.dsp
similarity index 100%
rename from jni/libexpat/expatw_static.dsp
rename to jni/libexpat/sources/expatw_static.dsp
diff --git a/jni/libexpat/iasciitab.h b/jni/libexpat/sources/iasciitab.h
similarity index 100%
rename from jni/libexpat/iasciitab.h
rename to jni/libexpat/sources/iasciitab.h
diff --git a/jni/libexpat/ic_launcher-web.png b/jni/libexpat/sources/ic_launcher-web.png
similarity index 100%
rename from jni/libexpat/ic_launcher-web.png
rename to jni/libexpat/sources/ic_launcher-web.png
Binary files differ
diff --git a/jni/libexpat/internal.h b/jni/libexpat/sources/internal.h
similarity index 100%
rename from jni/libexpat/internal.h
rename to jni/libexpat/sources/internal.h
diff --git a/jni/libexpat/latin1tab.h b/jni/libexpat/sources/latin1tab.h
similarity index 100%
rename from jni/libexpat/latin1tab.h
rename to jni/libexpat/sources/latin1tab.h
diff --git a/jni/libexpat/libexpat.def b/jni/libexpat/sources/libexpat.def
similarity index 100%
rename from jni/libexpat/libexpat.def
rename to jni/libexpat/sources/libexpat.def
diff --git a/jni/libexpat/libexpatw.def b/jni/libexpat/sources/libexpatw.def
similarity index 100%
rename from jni/libexpat/libexpatw.def
rename to jni/libexpat/sources/libexpatw.def
diff --git a/jni/libexpat/macconfig.h b/jni/libexpat/sources/macconfig.h
similarity index 100%
rename from jni/libexpat/macconfig.h
rename to jni/libexpat/sources/macconfig.h
diff --git a/jni/libexpat/nametab.h b/jni/libexpat/sources/nametab.h
similarity index 100%
rename from jni/libexpat/nametab.h
rename to jni/libexpat/sources/nametab.h
diff --git a/jni/libexpat/utf8tab.h b/jni/libexpat/sources/utf8tab.h
similarity index 100%
rename from jni/libexpat/utf8tab.h
rename to jni/libexpat/sources/utf8tab.h
diff --git a/jni/libexpat/winconfig.h b/jni/libexpat/sources/winconfig.h
similarity index 100%
rename from jni/libexpat/winconfig.h
rename to jni/libexpat/sources/winconfig.h
diff --git a/jni/libexpat/xmlparse.c b/jni/libexpat/sources/xmlparse.c
similarity index 100%
rename from jni/libexpat/xmlparse.c
rename to jni/libexpat/sources/xmlparse.c
diff --git a/jni/libexpat/xmlrole.c b/jni/libexpat/sources/xmlrole.c
similarity index 100%
rename from jni/libexpat/xmlrole.c
rename to jni/libexpat/sources/xmlrole.c
diff --git a/jni/libexpat/xmlrole.h b/jni/libexpat/sources/xmlrole.h
similarity index 100%
rename from jni/libexpat/xmlrole.h
rename to jni/libexpat/sources/xmlrole.h
diff --git a/jni/libexpat/xmltok.c b/jni/libexpat/sources/xmltok.c
similarity index 100%
rename from jni/libexpat/xmltok.c
rename to jni/libexpat/sources/xmltok.c
diff --git a/jni/libexpat/xmltok.h b/jni/libexpat/sources/xmltok.h
similarity index 100%
rename from jni/libexpat/xmltok.h
rename to jni/libexpat/sources/xmltok.h
diff --git a/jni/libexpat/xmltok_impl.c b/jni/libexpat/sources/xmltok_impl.c
similarity index 100%
rename from jni/libexpat/xmltok_impl.c
rename to jni/libexpat/sources/xmltok_impl.c
diff --git a/jni/libexpat/xmltok_impl.h b/jni/libexpat/sources/xmltok_impl.h
similarity index 100%
rename from jni/libexpat/xmltok_impl.h
rename to jni/libexpat/sources/xmltok_impl.h
diff --git a/jni/libexpat/xmltok_ns.c b/jni/libexpat/sources/xmltok_ns.c
similarity index 100%
rename from jni/libexpat/xmltok_ns.c
rename to jni/libexpat/sources/xmltok_ns.c
diff --git a/jni/libgsm/Android.mk b/jni/libgsm/Android.mk
new file mode 100644
index 0000000..242616b
--- /dev/null
+++ b/jni/libgsm/Android.mk
@@ -0,0 +1,38 @@
+include $(CLEAR_VARS)
+
+MY_LIBGSM = libgsm/sources
+
+LOCAL_SRC_FILES := 	$(MY_LIBGSM)/src/add.c \
+					$(MY_LIBGSM)/src/debug.c \
+					$(MY_LIBGSM)/src/gsm_create.c \
+					$(MY_LIBGSM)/src/gsm_destroy.c \
+					$(MY_LIBGSM)/src/gsm_explode.c \
+					$(MY_LIBGSM)/src/gsm_option.c \
+					$(MY_LIBGSM)/src/long_term.c \
+					$(MY_LIBGSM)/src/preprocess.c \
+					$(MY_LIBGSM)/src/short_term.c \
+					$(MY_LIBGSM)/src/code.c \
+					$(MY_LIBGSM)/src/gsm_decode.c \
+					$(MY_LIBGSM)/src/gsm_encode.c \
+					$(MY_LIBGSM)/src/decode.c \
+					$(MY_LIBGSM)/src/gsm_print.c \
+					$(MY_LIBGSM)/src/lpc.c \
+					$(MY_LIBGSM)/src/rpe.c \
+					$(MY_LIBGSM)/src/table.c \
+
+LOCAL_C_INCLUDES := $(MY_LIBGSM)/inc
+
+LOCAL_MODULE := libgsm
+
+LOCAL_LDLIBS := -llog
+
+LOCAL_CPPFLAGS += $(NETWORKMANAGER) \
+					-DCCPP_PREFIX \
+					-DCODECS_DIR=\"/usr/lib/sflphone/audio/codec\" \
+					-DPREFIX=\"$(MY_PREFIX)\" \
+					-DPROGSHAREDIR=\"${MY_DATADIR}/sflphone\" \
+					-DHAVE_CONFIG_H \
+					-std=c++11 -frtti -fpermissive -fexceptions \
+					-DAPP_NAME=\"codecfactory\"
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libgsm/COPYRIGHT b/jni/libgsm/sources/COPYRIGHT
similarity index 100%
rename from jni/libgsm/COPYRIGHT
rename to jni/libgsm/sources/COPYRIGHT
diff --git a/jni/libgsm/ChangeLog b/jni/libgsm/sources/ChangeLog
similarity index 100%
rename from jni/libgsm/ChangeLog
rename to jni/libgsm/sources/ChangeLog
diff --git a/jni/libgsm/ChangeLog.orig b/jni/libgsm/sources/ChangeLog.orig
similarity index 100%
rename from jni/libgsm/ChangeLog.orig
rename to jni/libgsm/sources/ChangeLog.orig
diff --git a/jni/libgsm/INSTALL b/jni/libgsm/sources/INSTALL
similarity index 100%
rename from jni/libgsm/INSTALL
rename to jni/libgsm/sources/INSTALL
diff --git a/jni/libgsm/MACHINES b/jni/libgsm/sources/MACHINES
similarity index 100%
rename from jni/libgsm/MACHINES
rename to jni/libgsm/sources/MACHINES
diff --git a/jni/libgsm/MANIFEST b/jni/libgsm/sources/MANIFEST
similarity index 100%
rename from jni/libgsm/MANIFEST
rename to jni/libgsm/sources/MANIFEST
diff --git a/jni/libgsm/Makefile b/jni/libgsm/sources/Makefile
similarity index 100%
rename from jni/libgsm/Makefile
rename to jni/libgsm/sources/Makefile
diff --git a/jni/libgsm/README b/jni/libgsm/sources/README
similarity index 100%
rename from jni/libgsm/README
rename to jni/libgsm/sources/README
diff --git a/jni/libgsm/add-test/add_test.c b/jni/libgsm/sources/add-test/add_test.c
similarity index 100%
rename from jni/libgsm/add-test/add_test.c
rename to jni/libgsm/sources/add-test/add_test.c
diff --git a/jni/libgsm/add-test/add_test.dta b/jni/libgsm/sources/add-test/add_test.dta
similarity index 100%
rename from jni/libgsm/add-test/add_test.dta
rename to jni/libgsm/sources/add-test/add_test.dta
diff --git a/jni/libgsm/inc/config.h b/jni/libgsm/sources/inc/config.h
similarity index 100%
rename from jni/libgsm/inc/config.h
rename to jni/libgsm/sources/inc/config.h
diff --git a/jni/libgsm/inc/gsm.h b/jni/libgsm/sources/inc/gsm.h
similarity index 100%
rename from jni/libgsm/inc/gsm.h
rename to jni/libgsm/sources/inc/gsm.h
diff --git a/jni/libgsm/inc/gsm.h.orig b/jni/libgsm/sources/inc/gsm.h.orig
similarity index 100%
rename from jni/libgsm/inc/gsm.h.orig
rename to jni/libgsm/sources/inc/gsm.h.orig
diff --git a/jni/libgsm/inc/private.h b/jni/libgsm/sources/inc/private.h
similarity index 100%
rename from jni/libgsm/inc/private.h
rename to jni/libgsm/sources/inc/private.h
diff --git a/jni/libgsm/inc/proto.h b/jni/libgsm/sources/inc/proto.h
similarity index 100%
rename from jni/libgsm/inc/proto.h
rename to jni/libgsm/sources/inc/proto.h
diff --git a/jni/libgsm/inc/toast.h b/jni/libgsm/sources/inc/toast.h
similarity index 100%
rename from jni/libgsm/inc/toast.h
rename to jni/libgsm/sources/inc/toast.h
diff --git a/jni/libgsm/inc/unproto.h b/jni/libgsm/sources/inc/unproto.h
similarity index 100%
rename from jni/libgsm/inc/unproto.h
rename to jni/libgsm/sources/inc/unproto.h
diff --git a/jni/libgsm/man/bitter.1 b/jni/libgsm/sources/man/bitter.1
similarity index 100%
rename from jni/libgsm/man/bitter.1
rename to jni/libgsm/sources/man/bitter.1
diff --git a/jni/libgsm/man/gsm.3 b/jni/libgsm/sources/man/gsm.3
similarity index 100%
rename from jni/libgsm/man/gsm.3
rename to jni/libgsm/sources/man/gsm.3
diff --git a/jni/libgsm/man/gsm_explode.3 b/jni/libgsm/sources/man/gsm_explode.3
similarity index 100%
rename from jni/libgsm/man/gsm_explode.3
rename to jni/libgsm/sources/man/gsm_explode.3
diff --git a/jni/libgsm/man/gsm_option.3 b/jni/libgsm/sources/man/gsm_option.3
similarity index 100%
rename from jni/libgsm/man/gsm_option.3
rename to jni/libgsm/sources/man/gsm_option.3
diff --git a/jni/libgsm/man/gsm_print.3 b/jni/libgsm/sources/man/gsm_print.3
similarity index 100%
rename from jni/libgsm/man/gsm_print.3
rename to jni/libgsm/sources/man/gsm_print.3
diff --git a/jni/libgsm/man/toast.1 b/jni/libgsm/sources/man/toast.1
similarity index 100%
rename from jni/libgsm/man/toast.1
rename to jni/libgsm/sources/man/toast.1
diff --git a/jni/libgsm/src/add.c b/jni/libgsm/sources/src/add.c
similarity index 100%
rename from jni/libgsm/src/add.c
rename to jni/libgsm/sources/src/add.c
diff --git a/jni/libgsm/src/code.c b/jni/libgsm/sources/src/code.c
similarity index 100%
rename from jni/libgsm/src/code.c
rename to jni/libgsm/sources/src/code.c
diff --git a/jni/libgsm/src/debug.c b/jni/libgsm/sources/src/debug.c
similarity index 100%
rename from jni/libgsm/src/debug.c
rename to jni/libgsm/sources/src/debug.c
diff --git a/jni/libgsm/src/decode.c b/jni/libgsm/sources/src/decode.c
similarity index 100%
rename from jni/libgsm/src/decode.c
rename to jni/libgsm/sources/src/decode.c
diff --git a/jni/libgsm/src/gsm_create.c b/jni/libgsm/sources/src/gsm_create.c
similarity index 100%
rename from jni/libgsm/src/gsm_create.c
rename to jni/libgsm/sources/src/gsm_create.c
diff --git a/jni/libgsm/src/gsm_decode.c b/jni/libgsm/sources/src/gsm_decode.c
similarity index 100%
rename from jni/libgsm/src/gsm_decode.c
rename to jni/libgsm/sources/src/gsm_decode.c
diff --git a/jni/libgsm/src/gsm_destroy.c b/jni/libgsm/sources/src/gsm_destroy.c
similarity index 100%
rename from jni/libgsm/src/gsm_destroy.c
rename to jni/libgsm/sources/src/gsm_destroy.c
diff --git a/jni/libgsm/src/gsm_encode.c b/jni/libgsm/sources/src/gsm_encode.c
similarity index 100%
rename from jni/libgsm/src/gsm_encode.c
rename to jni/libgsm/sources/src/gsm_encode.c
diff --git a/jni/libgsm/src/gsm_explode.c b/jni/libgsm/sources/src/gsm_explode.c
similarity index 100%
rename from jni/libgsm/src/gsm_explode.c
rename to jni/libgsm/sources/src/gsm_explode.c
diff --git a/jni/libgsm/src/gsm_implode.c b/jni/libgsm/sources/src/gsm_implode.c
similarity index 100%
rename from jni/libgsm/src/gsm_implode.c
rename to jni/libgsm/sources/src/gsm_implode.c
diff --git a/jni/libgsm/src/gsm_option.c b/jni/libgsm/sources/src/gsm_option.c
similarity index 100%
rename from jni/libgsm/src/gsm_option.c
rename to jni/libgsm/sources/src/gsm_option.c
diff --git a/jni/libgsm/src/gsm_print.c b/jni/libgsm/sources/src/gsm_print.c
similarity index 100%
rename from jni/libgsm/src/gsm_print.c
rename to jni/libgsm/sources/src/gsm_print.c
diff --git a/jni/libgsm/src/long_term.c b/jni/libgsm/sources/src/long_term.c
similarity index 100%
rename from jni/libgsm/src/long_term.c
rename to jni/libgsm/sources/src/long_term.c
diff --git a/jni/libgsm/src/lpc.c b/jni/libgsm/sources/src/lpc.c
similarity index 100%
rename from jni/libgsm/src/lpc.c
rename to jni/libgsm/sources/src/lpc.c
diff --git a/jni/libgsm/src/preprocess.c b/jni/libgsm/sources/src/preprocess.c
similarity index 100%
rename from jni/libgsm/src/preprocess.c
rename to jni/libgsm/sources/src/preprocess.c
diff --git a/jni/libgsm/src/rpe.c b/jni/libgsm/sources/src/rpe.c
similarity index 100%
rename from jni/libgsm/src/rpe.c
rename to jni/libgsm/sources/src/rpe.c
diff --git a/jni/libgsm/src/short_term.c b/jni/libgsm/sources/src/short_term.c
similarity index 100%
rename from jni/libgsm/src/short_term.c
rename to jni/libgsm/sources/src/short_term.c
diff --git a/jni/libgsm/src/table.c b/jni/libgsm/sources/src/table.c
similarity index 100%
rename from jni/libgsm/src/table.c
rename to jni/libgsm/sources/src/table.c
diff --git a/jni/libgsm/src/toast.c b/jni/libgsm/sources/src/toast.c
similarity index 100%
rename from jni/libgsm/src/toast.c
rename to jni/libgsm/sources/src/toast.c
diff --git a/jni/libgsm/src/toast_alaw.c b/jni/libgsm/sources/src/toast_alaw.c
similarity index 100%
rename from jni/libgsm/src/toast_alaw.c
rename to jni/libgsm/sources/src/toast_alaw.c
diff --git a/jni/libgsm/src/toast_alaw.c.orig b/jni/libgsm/sources/src/toast_alaw.c.orig
similarity index 100%
rename from jni/libgsm/src/toast_alaw.c.orig
rename to jni/libgsm/sources/src/toast_alaw.c.orig
diff --git a/jni/libgsm/src/toast_audio.c b/jni/libgsm/sources/src/toast_audio.c
similarity index 100%
rename from jni/libgsm/src/toast_audio.c
rename to jni/libgsm/sources/src/toast_audio.c
diff --git a/jni/libgsm/src/toast_lin.c b/jni/libgsm/sources/src/toast_lin.c
similarity index 100%
rename from jni/libgsm/src/toast_lin.c
rename to jni/libgsm/sources/src/toast_lin.c
diff --git a/jni/libgsm/src/toast_ulaw.c b/jni/libgsm/sources/src/toast_ulaw.c
similarity index 100%
rename from jni/libgsm/src/toast_ulaw.c
rename to jni/libgsm/sources/src/toast_ulaw.c
diff --git a/jni/libgsm/tls/bitter.c b/jni/libgsm/sources/tls/bitter.c
similarity index 100%
rename from jni/libgsm/tls/bitter.c
rename to jni/libgsm/sources/tls/bitter.c
diff --git a/jni/libgsm/tls/bitter.dta b/jni/libgsm/sources/tls/bitter.dta
similarity index 100%
rename from jni/libgsm/tls/bitter.dta
rename to jni/libgsm/sources/tls/bitter.dta
diff --git a/jni/libgsm/tls/ginger.c b/jni/libgsm/sources/tls/ginger.c
similarity index 100%
rename from jni/libgsm/tls/ginger.c
rename to jni/libgsm/sources/tls/ginger.c
diff --git a/jni/libgsm/tls/sour.c b/jni/libgsm/sources/tls/sour.c
similarity index 100%
rename from jni/libgsm/tls/sour.c
rename to jni/libgsm/sources/tls/sour.c
diff --git a/jni/libgsm/tls/sour1.dta b/jni/libgsm/sources/tls/sour1.dta
similarity index 100%
rename from jni/libgsm/tls/sour1.dta
rename to jni/libgsm/sources/tls/sour1.dta
diff --git a/jni/libgsm/tls/sour2.dta b/jni/libgsm/sources/tls/sour2.dta
similarity index 100%
rename from jni/libgsm/tls/sour2.dta
rename to jni/libgsm/sources/tls/sour2.dta
diff --git a/jni/libgsm/tls/sweet.c b/jni/libgsm/sources/tls/sweet.c
similarity index 100%
rename from jni/libgsm/tls/sweet.c
rename to jni/libgsm/sources/tls/sweet.c
diff --git a/jni/libgsm/tls/taste.c b/jni/libgsm/sources/tls/taste.c
similarity index 100%
rename from jni/libgsm/tls/taste.c
rename to jni/libgsm/sources/tls/taste.c
diff --git a/jni/libgsm/tls/taste.h b/jni/libgsm/sources/tls/taste.h
similarity index 100%
rename from jni/libgsm/tls/taste.h
rename to jni/libgsm/sources/tls/taste.h
diff --git a/jni/libgsm/tst/cod2lin.c b/jni/libgsm/sources/tst/cod2lin.c
similarity index 100%
rename from jni/libgsm/tst/cod2lin.c
rename to jni/libgsm/sources/tst/cod2lin.c
diff --git a/jni/libgsm/tst/cod2txt.c b/jni/libgsm/sources/tst/cod2txt.c
similarity index 100%
rename from jni/libgsm/tst/cod2txt.c
rename to jni/libgsm/sources/tst/cod2txt.c
diff --git a/jni/libgsm/tst/gsm2cod.c b/jni/libgsm/sources/tst/gsm2cod.c
similarity index 100%
rename from jni/libgsm/tst/gsm2cod.c
rename to jni/libgsm/sources/tst/gsm2cod.c
diff --git a/jni/libgsm/tst/lin2cod.c b/jni/libgsm/sources/tst/lin2cod.c
similarity index 100%
rename from jni/libgsm/tst/lin2cod.c
rename to jni/libgsm/sources/tst/lin2cod.c
diff --git a/jni/libgsm/tst/lin2txt.c b/jni/libgsm/sources/tst/lin2txt.c
similarity index 100%
rename from jni/libgsm/tst/lin2txt.c
rename to jni/libgsm/sources/tst/lin2txt.c
diff --git a/jni/libgsm/tst/run b/jni/libgsm/sources/tst/run
similarity index 100%
rename from jni/libgsm/tst/run
rename to jni/libgsm/sources/tst/run
diff --git a/jni/openssl/Android.mk b/jni/libopenssl/Android.mk
similarity index 73%
rename from jni/openssl/Android.mk
rename to jni/libopenssl/Android.mk
index 741123b..b335692 100644
--- a/jni/openssl/Android.mk
+++ b/jni/libopenssl/Android.mk
@@ -1,3 +1,5 @@
+OLD_PATH := $(LOCAL_PATH)
+
 LOCAL_PATH := $(call my-dir)
 
 subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
@@ -7,3 +9,5 @@
 	))
 
 include $(subdirs)
+
+LOCAL_PATH := $(OLD_PATH)
diff --git a/jni/openssl/CleanSpec.mk b/jni/libopenssl/CleanSpec.mk
similarity index 100%
rename from jni/openssl/CleanSpec.mk
rename to jni/libopenssl/CleanSpec.mk
diff --git a/jni/openssl/MODULE_LICENSE_BSD_LIKE b/jni/libopenssl/MODULE_LICENSE_BSD_LIKE
similarity index 100%
rename from jni/openssl/MODULE_LICENSE_BSD_LIKE
rename to jni/libopenssl/MODULE_LICENSE_BSD_LIKE
diff --git a/jni/openssl/NOTICE b/jni/libopenssl/NOTICE
similarity index 100%
rename from jni/openssl/NOTICE
rename to jni/libopenssl/NOTICE
diff --git a/jni/openssl/README.android b/jni/libopenssl/README.android
similarity index 100%
rename from jni/openssl/README.android
rename to jni/libopenssl/README.android
diff --git a/jni/openssl/ThirdPartyProject.prop b/jni/libopenssl/ThirdPartyProject.prop
similarity index 100%
rename from jni/openssl/ThirdPartyProject.prop
rename to jni/libopenssl/ThirdPartyProject.prop
diff --git a/jni/openssl/android-config.mk b/jni/libopenssl/android-config.mk
similarity index 100%
rename from jni/openssl/android-config.mk
rename to jni/libopenssl/android-config.mk
diff --git a/jni/openssl/android.testssl/CAss.cnf b/jni/libopenssl/android.testssl/CAss.cnf
similarity index 100%
rename from jni/openssl/android.testssl/CAss.cnf
rename to jni/libopenssl/android.testssl/CAss.cnf
diff --git a/jni/openssl/android.testssl/Uss.cnf b/jni/libopenssl/android.testssl/Uss.cnf
similarity index 100%
rename from jni/openssl/android.testssl/Uss.cnf
rename to jni/libopenssl/android.testssl/Uss.cnf
diff --git a/jni/openssl/android.testssl/server2.pem b/jni/libopenssl/android.testssl/server2.pem
similarity index 100%
rename from jni/openssl/android.testssl/server2.pem
rename to jni/libopenssl/android.testssl/server2.pem
diff --git a/jni/openssl/android.testssl/testssl b/jni/libopenssl/android.testssl/testssl
similarity index 100%
rename from jni/openssl/android.testssl/testssl
rename to jni/libopenssl/android.testssl/testssl
diff --git a/jni/openssl/android.testssl/testssl.sh b/jni/libopenssl/android.testssl/testssl.sh
similarity index 100%
rename from jni/openssl/android.testssl/testssl.sh
rename to jni/libopenssl/android.testssl/testssl.sh
diff --git a/jni/openssl/apps/Android.mk b/jni/libopenssl/apps/Android.mk
similarity index 100%
rename from jni/openssl/apps/Android.mk
rename to jni/libopenssl/apps/Android.mk
diff --git a/jni/openssl/apps/CA.pl b/jni/libopenssl/apps/CA.pl
similarity index 100%
rename from jni/openssl/apps/CA.pl
rename to jni/libopenssl/apps/CA.pl
diff --git a/jni/openssl/apps/CA.pl.in b/jni/libopenssl/apps/CA.pl.in
similarity index 100%
rename from jni/openssl/apps/CA.pl.in
rename to jni/libopenssl/apps/CA.pl.in
diff --git a/jni/openssl/apps/CA.sh b/jni/libopenssl/apps/CA.sh
similarity index 100%
rename from jni/openssl/apps/CA.sh
rename to jni/libopenssl/apps/CA.sh
diff --git a/jni/openssl/apps/app_rand.c b/jni/libopenssl/apps/app_rand.c
similarity index 100%
rename from jni/openssl/apps/app_rand.c
rename to jni/libopenssl/apps/app_rand.c
diff --git a/jni/openssl/apps/apps.c b/jni/libopenssl/apps/apps.c
similarity index 100%
rename from jni/openssl/apps/apps.c
rename to jni/libopenssl/apps/apps.c
diff --git a/jni/openssl/apps/apps.h b/jni/libopenssl/apps/apps.h
similarity index 100%
rename from jni/openssl/apps/apps.h
rename to jni/libopenssl/apps/apps.h
diff --git a/jni/openssl/apps/asn1pars.c b/jni/libopenssl/apps/asn1pars.c
similarity index 100%
rename from jni/openssl/apps/asn1pars.c
rename to jni/libopenssl/apps/asn1pars.c
diff --git a/jni/openssl/apps/ca-cert.srl b/jni/libopenssl/apps/ca-cert.srl
similarity index 100%
rename from jni/openssl/apps/ca-cert.srl
rename to jni/libopenssl/apps/ca-cert.srl
diff --git a/jni/openssl/apps/ca-key.pem b/jni/libopenssl/apps/ca-key.pem
similarity index 100%
rename from jni/openssl/apps/ca-key.pem
rename to jni/libopenssl/apps/ca-key.pem
diff --git a/jni/openssl/apps/ca-req.pem b/jni/libopenssl/apps/ca-req.pem
similarity index 100%
rename from jni/openssl/apps/ca-req.pem
rename to jni/libopenssl/apps/ca-req.pem
diff --git a/jni/openssl/apps/ca.c b/jni/libopenssl/apps/ca.c
similarity index 100%
rename from jni/openssl/apps/ca.c
rename to jni/libopenssl/apps/ca.c
diff --git a/jni/openssl/apps/cert.pem b/jni/libopenssl/apps/cert.pem
similarity index 100%
rename from jni/openssl/apps/cert.pem
rename to jni/libopenssl/apps/cert.pem
diff --git a/jni/openssl/apps/ciphers.c b/jni/libopenssl/apps/ciphers.c
similarity index 100%
rename from jni/openssl/apps/ciphers.c
rename to jni/libopenssl/apps/ciphers.c
diff --git a/jni/openssl/apps/client.pem b/jni/libopenssl/apps/client.pem
similarity index 100%
rename from jni/openssl/apps/client.pem
rename to jni/libopenssl/apps/client.pem
diff --git a/jni/openssl/apps/cms.c b/jni/libopenssl/apps/cms.c
similarity index 100%
rename from jni/openssl/apps/cms.c
rename to jni/libopenssl/apps/cms.c
diff --git a/jni/openssl/apps/crl.c b/jni/libopenssl/apps/crl.c
similarity index 100%
rename from jni/openssl/apps/crl.c
rename to jni/libopenssl/apps/crl.c
diff --git a/jni/openssl/apps/crl2p7.c b/jni/libopenssl/apps/crl2p7.c
similarity index 100%
rename from jni/openssl/apps/crl2p7.c
rename to jni/libopenssl/apps/crl2p7.c
diff --git a/jni/openssl/apps/dgst.c b/jni/libopenssl/apps/dgst.c
similarity index 100%
rename from jni/openssl/apps/dgst.c
rename to jni/libopenssl/apps/dgst.c
diff --git a/jni/openssl/apps/dh.c b/jni/libopenssl/apps/dh.c
similarity index 100%
rename from jni/openssl/apps/dh.c
rename to jni/libopenssl/apps/dh.c
diff --git a/jni/openssl/apps/dh1024.pem b/jni/libopenssl/apps/dh1024.pem
similarity index 100%
rename from jni/openssl/apps/dh1024.pem
rename to jni/libopenssl/apps/dh1024.pem
diff --git a/jni/openssl/apps/dh2048.pem b/jni/libopenssl/apps/dh2048.pem
similarity index 100%
rename from jni/openssl/apps/dh2048.pem
rename to jni/libopenssl/apps/dh2048.pem
diff --git a/jni/openssl/apps/dh4096.pem b/jni/libopenssl/apps/dh4096.pem
similarity index 100%
rename from jni/openssl/apps/dh4096.pem
rename to jni/libopenssl/apps/dh4096.pem
diff --git a/jni/openssl/apps/dh512.pem b/jni/libopenssl/apps/dh512.pem
similarity index 100%
rename from jni/openssl/apps/dh512.pem
rename to jni/libopenssl/apps/dh512.pem
diff --git a/jni/openssl/apps/dhparam.c b/jni/libopenssl/apps/dhparam.c
similarity index 100%
rename from jni/openssl/apps/dhparam.c
rename to jni/libopenssl/apps/dhparam.c
diff --git a/jni/openssl/apps/dsa-ca.pem b/jni/libopenssl/apps/dsa-ca.pem
similarity index 100%
rename from jni/openssl/apps/dsa-ca.pem
rename to jni/libopenssl/apps/dsa-ca.pem
diff --git a/jni/openssl/apps/dsa-pca.pem b/jni/libopenssl/apps/dsa-pca.pem
similarity index 100%
rename from jni/openssl/apps/dsa-pca.pem
rename to jni/libopenssl/apps/dsa-pca.pem
diff --git a/jni/openssl/apps/dsa.c b/jni/libopenssl/apps/dsa.c
similarity index 100%
rename from jni/openssl/apps/dsa.c
rename to jni/libopenssl/apps/dsa.c
diff --git a/jni/openssl/apps/dsa1024.pem b/jni/libopenssl/apps/dsa1024.pem
similarity index 100%
rename from jni/openssl/apps/dsa1024.pem
rename to jni/libopenssl/apps/dsa1024.pem
diff --git a/jni/openssl/apps/dsa512.pem b/jni/libopenssl/apps/dsa512.pem
similarity index 100%
rename from jni/openssl/apps/dsa512.pem
rename to jni/libopenssl/apps/dsa512.pem
diff --git a/jni/openssl/apps/dsap.pem b/jni/libopenssl/apps/dsap.pem
similarity index 100%
rename from jni/openssl/apps/dsap.pem
rename to jni/libopenssl/apps/dsap.pem
diff --git a/jni/openssl/apps/dsaparam.c b/jni/libopenssl/apps/dsaparam.c
similarity index 100%
rename from jni/openssl/apps/dsaparam.c
rename to jni/libopenssl/apps/dsaparam.c
diff --git a/jni/openssl/apps/ec.c b/jni/libopenssl/apps/ec.c
similarity index 100%
rename from jni/openssl/apps/ec.c
rename to jni/libopenssl/apps/ec.c
diff --git a/jni/openssl/apps/ecparam.c b/jni/libopenssl/apps/ecparam.c
similarity index 100%
rename from jni/openssl/apps/ecparam.c
rename to jni/libopenssl/apps/ecparam.c
diff --git a/jni/openssl/apps/enc.c b/jni/libopenssl/apps/enc.c
similarity index 100%
rename from jni/openssl/apps/enc.c
rename to jni/libopenssl/apps/enc.c
diff --git a/jni/openssl/apps/engine.c b/jni/libopenssl/apps/engine.c
similarity index 100%
rename from jni/openssl/apps/engine.c
rename to jni/libopenssl/apps/engine.c
diff --git a/jni/openssl/apps/errstr.c b/jni/libopenssl/apps/errstr.c
similarity index 100%
rename from jni/openssl/apps/errstr.c
rename to jni/libopenssl/apps/errstr.c
diff --git a/jni/openssl/apps/gendh.c b/jni/libopenssl/apps/gendh.c
similarity index 100%
rename from jni/openssl/apps/gendh.c
rename to jni/libopenssl/apps/gendh.c
diff --git a/jni/openssl/apps/gendsa.c b/jni/libopenssl/apps/gendsa.c
similarity index 100%
rename from jni/openssl/apps/gendsa.c
rename to jni/libopenssl/apps/gendsa.c
diff --git a/jni/openssl/apps/genpkey.c b/jni/libopenssl/apps/genpkey.c
similarity index 100%
rename from jni/openssl/apps/genpkey.c
rename to jni/libopenssl/apps/genpkey.c
diff --git a/jni/openssl/apps/genrsa.c b/jni/libopenssl/apps/genrsa.c
similarity index 100%
rename from jni/openssl/apps/genrsa.c
rename to jni/libopenssl/apps/genrsa.c
diff --git a/jni/openssl/apps/md4.c b/jni/libopenssl/apps/md4.c
similarity index 100%
rename from jni/openssl/apps/md4.c
rename to jni/libopenssl/apps/md4.c
diff --git a/jni/openssl/apps/nseq.c b/jni/libopenssl/apps/nseq.c
similarity index 100%
rename from jni/openssl/apps/nseq.c
rename to jni/libopenssl/apps/nseq.c
diff --git a/jni/openssl/apps/ocsp.c b/jni/libopenssl/apps/ocsp.c
similarity index 100%
rename from jni/openssl/apps/ocsp.c
rename to jni/libopenssl/apps/ocsp.c
diff --git a/jni/openssl/apps/oid.cnf b/jni/libopenssl/apps/oid.cnf
similarity index 100%
rename from jni/openssl/apps/oid.cnf
rename to jni/libopenssl/apps/oid.cnf
diff --git a/jni/openssl/apps/openssl.c b/jni/libopenssl/apps/openssl.c
similarity index 100%
rename from jni/openssl/apps/openssl.c
rename to jni/libopenssl/apps/openssl.c
diff --git a/jni/openssl/apps/openssl.cnf b/jni/libopenssl/apps/openssl.cnf
similarity index 100%
rename from jni/openssl/apps/openssl.cnf
rename to jni/libopenssl/apps/openssl.cnf
diff --git a/jni/openssl/apps/passwd.c b/jni/libopenssl/apps/passwd.c
similarity index 100%
rename from jni/openssl/apps/passwd.c
rename to jni/libopenssl/apps/passwd.c
diff --git a/jni/openssl/apps/pca-cert.srl b/jni/libopenssl/apps/pca-cert.srl
similarity index 100%
rename from jni/openssl/apps/pca-cert.srl
rename to jni/libopenssl/apps/pca-cert.srl
diff --git a/jni/openssl/apps/pca-key.pem b/jni/libopenssl/apps/pca-key.pem
similarity index 100%
rename from jni/openssl/apps/pca-key.pem
rename to jni/libopenssl/apps/pca-key.pem
diff --git a/jni/openssl/apps/pca-req.pem b/jni/libopenssl/apps/pca-req.pem
similarity index 100%
rename from jni/openssl/apps/pca-req.pem
rename to jni/libopenssl/apps/pca-req.pem
diff --git a/jni/openssl/apps/pkcs12.c b/jni/libopenssl/apps/pkcs12.c
similarity index 100%
rename from jni/openssl/apps/pkcs12.c
rename to jni/libopenssl/apps/pkcs12.c
diff --git a/jni/openssl/apps/pkcs7.c b/jni/libopenssl/apps/pkcs7.c
similarity index 100%
rename from jni/openssl/apps/pkcs7.c
rename to jni/libopenssl/apps/pkcs7.c
diff --git a/jni/openssl/apps/pkcs8.c b/jni/libopenssl/apps/pkcs8.c
similarity index 100%
rename from jni/openssl/apps/pkcs8.c
rename to jni/libopenssl/apps/pkcs8.c
diff --git a/jni/openssl/apps/pkey.c b/jni/libopenssl/apps/pkey.c
similarity index 100%
rename from jni/openssl/apps/pkey.c
rename to jni/libopenssl/apps/pkey.c
diff --git a/jni/openssl/apps/pkeyparam.c b/jni/libopenssl/apps/pkeyparam.c
similarity index 100%
rename from jni/openssl/apps/pkeyparam.c
rename to jni/libopenssl/apps/pkeyparam.c
diff --git a/jni/openssl/apps/pkeyutl.c b/jni/libopenssl/apps/pkeyutl.c
similarity index 100%
rename from jni/openssl/apps/pkeyutl.c
rename to jni/libopenssl/apps/pkeyutl.c
diff --git a/jni/openssl/apps/prime.c b/jni/libopenssl/apps/prime.c
similarity index 100%
rename from jni/openssl/apps/prime.c
rename to jni/libopenssl/apps/prime.c
diff --git a/jni/openssl/apps/privkey.pem b/jni/libopenssl/apps/privkey.pem
similarity index 100%
rename from jni/openssl/apps/privkey.pem
rename to jni/libopenssl/apps/privkey.pem
diff --git a/jni/openssl/apps/progs.h b/jni/libopenssl/apps/progs.h
similarity index 100%
rename from jni/openssl/apps/progs.h
rename to jni/libopenssl/apps/progs.h
diff --git a/jni/openssl/apps/progs.pl b/jni/libopenssl/apps/progs.pl
similarity index 100%
rename from jni/openssl/apps/progs.pl
rename to jni/libopenssl/apps/progs.pl
diff --git a/jni/openssl/apps/rand.c b/jni/libopenssl/apps/rand.c
similarity index 100%
rename from jni/openssl/apps/rand.c
rename to jni/libopenssl/apps/rand.c
diff --git a/jni/openssl/apps/req.c b/jni/libopenssl/apps/req.c
similarity index 100%
rename from jni/openssl/apps/req.c
rename to jni/libopenssl/apps/req.c
diff --git a/jni/openssl/apps/req.pem b/jni/libopenssl/apps/req.pem
similarity index 100%
rename from jni/openssl/apps/req.pem
rename to jni/libopenssl/apps/req.pem
diff --git a/jni/openssl/apps/rsa.c b/jni/libopenssl/apps/rsa.c
similarity index 100%
rename from jni/openssl/apps/rsa.c
rename to jni/libopenssl/apps/rsa.c
diff --git a/jni/openssl/apps/rsa8192.pem b/jni/libopenssl/apps/rsa8192.pem
similarity index 100%
rename from jni/openssl/apps/rsa8192.pem
rename to jni/libopenssl/apps/rsa8192.pem
diff --git a/jni/openssl/apps/rsautl.c b/jni/libopenssl/apps/rsautl.c
similarity index 100%
rename from jni/openssl/apps/rsautl.c
rename to jni/libopenssl/apps/rsautl.c
diff --git a/jni/openssl/apps/s1024key.pem b/jni/libopenssl/apps/s1024key.pem
similarity index 100%
rename from jni/openssl/apps/s1024key.pem
rename to jni/libopenssl/apps/s1024key.pem
diff --git a/jni/openssl/apps/s1024req.pem b/jni/libopenssl/apps/s1024req.pem
similarity index 100%
rename from jni/openssl/apps/s1024req.pem
rename to jni/libopenssl/apps/s1024req.pem
diff --git a/jni/openssl/apps/s512-key.pem b/jni/libopenssl/apps/s512-key.pem
similarity index 100%
rename from jni/openssl/apps/s512-key.pem
rename to jni/libopenssl/apps/s512-key.pem
diff --git a/jni/openssl/apps/s512-req.pem b/jni/libopenssl/apps/s512-req.pem
similarity index 100%
rename from jni/openssl/apps/s512-req.pem
rename to jni/libopenssl/apps/s512-req.pem
diff --git a/jni/openssl/apps/s_apps.h b/jni/libopenssl/apps/s_apps.h
similarity index 100%
rename from jni/openssl/apps/s_apps.h
rename to jni/libopenssl/apps/s_apps.h
diff --git a/jni/openssl/apps/s_cb.c b/jni/libopenssl/apps/s_cb.c
similarity index 100%
rename from jni/openssl/apps/s_cb.c
rename to jni/libopenssl/apps/s_cb.c
diff --git a/jni/openssl/apps/s_client.c b/jni/libopenssl/apps/s_client.c
similarity index 100%
rename from jni/openssl/apps/s_client.c
rename to jni/libopenssl/apps/s_client.c
diff --git a/jni/openssl/apps/s_server.c b/jni/libopenssl/apps/s_server.c
similarity index 100%
rename from jni/openssl/apps/s_server.c
rename to jni/libopenssl/apps/s_server.c
diff --git a/jni/openssl/apps/s_socket.c b/jni/libopenssl/apps/s_socket.c
similarity index 100%
rename from jni/openssl/apps/s_socket.c
rename to jni/libopenssl/apps/s_socket.c
diff --git a/jni/openssl/apps/s_time.c b/jni/libopenssl/apps/s_time.c
similarity index 100%
rename from jni/openssl/apps/s_time.c
rename to jni/libopenssl/apps/s_time.c
diff --git a/jni/openssl/apps/server.pem b/jni/libopenssl/apps/server.pem
similarity index 100%
rename from jni/openssl/apps/server.pem
rename to jni/libopenssl/apps/server.pem
diff --git a/jni/openssl/apps/server.srl b/jni/libopenssl/apps/server.srl
similarity index 100%
rename from jni/openssl/apps/server.srl
rename to jni/libopenssl/apps/server.srl
diff --git a/jni/openssl/apps/server2.pem b/jni/libopenssl/apps/server2.pem
similarity index 100%
rename from jni/openssl/apps/server2.pem
rename to jni/libopenssl/apps/server2.pem
diff --git a/jni/openssl/apps/sess_id.c b/jni/libopenssl/apps/sess_id.c
similarity index 100%
rename from jni/openssl/apps/sess_id.c
rename to jni/libopenssl/apps/sess_id.c
diff --git a/jni/openssl/apps/smime.c b/jni/libopenssl/apps/smime.c
similarity index 100%
rename from jni/openssl/apps/smime.c
rename to jni/libopenssl/apps/smime.c
diff --git a/jni/openssl/apps/speed.c b/jni/libopenssl/apps/speed.c
similarity index 100%
rename from jni/openssl/apps/speed.c
rename to jni/libopenssl/apps/speed.c
diff --git a/jni/openssl/apps/spkac.c b/jni/libopenssl/apps/spkac.c
similarity index 100%
rename from jni/openssl/apps/spkac.c
rename to jni/libopenssl/apps/spkac.c
diff --git a/jni/openssl/apps/testCA.pem b/jni/libopenssl/apps/testCA.pem
similarity index 100%
rename from jni/openssl/apps/testCA.pem
rename to jni/libopenssl/apps/testCA.pem
diff --git a/jni/openssl/apps/testdsa.h b/jni/libopenssl/apps/testdsa.h
similarity index 100%
rename from jni/openssl/apps/testdsa.h
rename to jni/libopenssl/apps/testdsa.h
diff --git a/jni/openssl/apps/testrsa.h b/jni/libopenssl/apps/testrsa.h
similarity index 100%
rename from jni/openssl/apps/testrsa.h
rename to jni/libopenssl/apps/testrsa.h
diff --git a/jni/openssl/apps/timeouts.h b/jni/libopenssl/apps/timeouts.h
similarity index 100%
rename from jni/openssl/apps/timeouts.h
rename to jni/libopenssl/apps/timeouts.h
diff --git a/jni/openssl/apps/verify.c b/jni/libopenssl/apps/verify.c
similarity index 100%
rename from jni/openssl/apps/verify.c
rename to jni/libopenssl/apps/verify.c
diff --git a/jni/openssl/apps/version.c b/jni/libopenssl/apps/version.c
similarity index 100%
rename from jni/openssl/apps/version.c
rename to jni/libopenssl/apps/version.c
diff --git a/jni/openssl/apps/winrand.c b/jni/libopenssl/apps/winrand.c
similarity index 100%
rename from jni/openssl/apps/winrand.c
rename to jni/libopenssl/apps/winrand.c
diff --git a/jni/openssl/apps/x509.c b/jni/libopenssl/apps/x509.c
similarity index 100%
rename from jni/openssl/apps/x509.c
rename to jni/libopenssl/apps/x509.c
diff --git a/jni/openssl/crypto/Android.mk b/jni/libopenssl/crypto/Android.mk
similarity index 100%
rename from jni/openssl/crypto/Android.mk
rename to jni/libopenssl/crypto/Android.mk
diff --git a/jni/openssl/crypto/LPdir_nyi.c b/jni/libopenssl/crypto/LPdir_nyi.c
similarity index 100%
rename from jni/openssl/crypto/LPdir_nyi.c
rename to jni/libopenssl/crypto/LPdir_nyi.c
diff --git a/jni/openssl/crypto/LPdir_unix.c b/jni/libopenssl/crypto/LPdir_unix.c
similarity index 100%
rename from jni/openssl/crypto/LPdir_unix.c
rename to jni/libopenssl/crypto/LPdir_unix.c
diff --git a/jni/openssl/crypto/LPdir_win.c b/jni/libopenssl/crypto/LPdir_win.c
similarity index 100%
rename from jni/openssl/crypto/LPdir_win.c
rename to jni/libopenssl/crypto/LPdir_win.c
diff --git a/jni/openssl/crypto/LPdir_wince.c b/jni/libopenssl/crypto/LPdir_wince.c
similarity index 100%
rename from jni/openssl/crypto/LPdir_wince.c
rename to jni/libopenssl/crypto/LPdir_wince.c
diff --git a/jni/openssl/crypto/aes/README b/jni/libopenssl/crypto/aes/README
similarity index 100%
rename from jni/openssl/crypto/aes/README
rename to jni/libopenssl/crypto/aes/README
diff --git a/jni/openssl/crypto/aes/aes.h b/jni/libopenssl/crypto/aes/aes.h
similarity index 100%
rename from jni/openssl/crypto/aes/aes.h
rename to jni/libopenssl/crypto/aes/aes.h
diff --git a/jni/openssl/crypto/aes/aes_cbc.c b/jni/libopenssl/crypto/aes/aes_cbc.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_cbc.c
rename to jni/libopenssl/crypto/aes/aes_cbc.c
diff --git a/jni/openssl/crypto/aes/aes_cfb.c b/jni/libopenssl/crypto/aes/aes_cfb.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_cfb.c
rename to jni/libopenssl/crypto/aes/aes_cfb.c
diff --git a/jni/openssl/crypto/aes/aes_core.c b/jni/libopenssl/crypto/aes/aes_core.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_core.c
rename to jni/libopenssl/crypto/aes/aes_core.c
diff --git a/jni/openssl/crypto/aes/aes_ctr.c b/jni/libopenssl/crypto/aes/aes_ctr.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_ctr.c
rename to jni/libopenssl/crypto/aes/aes_ctr.c
diff --git a/jni/openssl/crypto/aes/aes_ecb.c b/jni/libopenssl/crypto/aes/aes_ecb.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_ecb.c
rename to jni/libopenssl/crypto/aes/aes_ecb.c
diff --git a/jni/openssl/crypto/aes/aes_ige.c b/jni/libopenssl/crypto/aes/aes_ige.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_ige.c
rename to jni/libopenssl/crypto/aes/aes_ige.c
diff --git a/jni/openssl/crypto/aes/aes_locl.h b/jni/libopenssl/crypto/aes/aes_locl.h
similarity index 100%
rename from jni/openssl/crypto/aes/aes_locl.h
rename to jni/libopenssl/crypto/aes/aes_locl.h
diff --git a/jni/openssl/crypto/aes/aes_misc.c b/jni/libopenssl/crypto/aes/aes_misc.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_misc.c
rename to jni/libopenssl/crypto/aes/aes_misc.c
diff --git a/jni/openssl/crypto/aes/aes_ofb.c b/jni/libopenssl/crypto/aes/aes_ofb.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_ofb.c
rename to jni/libopenssl/crypto/aes/aes_ofb.c
diff --git a/jni/openssl/crypto/aes/aes_wrap.c b/jni/libopenssl/crypto/aes/aes_wrap.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_wrap.c
rename to jni/libopenssl/crypto/aes/aes_wrap.c
diff --git a/jni/openssl/crypto/aes/aes_x86core.c b/jni/libopenssl/crypto/aes/aes_x86core.c
similarity index 100%
rename from jni/openssl/crypto/aes/aes_x86core.c
rename to jni/libopenssl/crypto/aes/aes_x86core.c
diff --git a/jni/openssl/crypto/aes/asm/aes-586.pl b/jni/libopenssl/crypto/aes/asm/aes-586.pl
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-586.pl
rename to jni/libopenssl/crypto/aes/asm/aes-586.pl
diff --git a/jni/openssl/crypto/aes/asm/aes-armv4.pl b/jni/libopenssl/crypto/aes/asm/aes-armv4.pl
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-armv4.pl
rename to jni/libopenssl/crypto/aes/asm/aes-armv4.pl
diff --git a/jni/openssl/crypto/aes/asm/aes-armv4.s b/jni/libopenssl/crypto/aes/asm/aes-armv4.s
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-armv4.s
rename to jni/libopenssl/crypto/aes/asm/aes-armv4.s
diff --git a/jni/openssl/crypto/aes/asm/aes-ia64.S b/jni/libopenssl/crypto/aes/asm/aes-ia64.S
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-ia64.S
rename to jni/libopenssl/crypto/aes/asm/aes-ia64.S
diff --git a/jni/openssl/crypto/aes/asm/aes-ppc.pl b/jni/libopenssl/crypto/aes/asm/aes-ppc.pl
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-ppc.pl
rename to jni/libopenssl/crypto/aes/asm/aes-ppc.pl
diff --git a/jni/openssl/crypto/aes/asm/aes-s390x.pl b/jni/libopenssl/crypto/aes/asm/aes-s390x.pl
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-s390x.pl
rename to jni/libopenssl/crypto/aes/asm/aes-s390x.pl
diff --git a/jni/openssl/crypto/aes/asm/aes-sparcv9.pl b/jni/libopenssl/crypto/aes/asm/aes-sparcv9.pl
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-sparcv9.pl
rename to jni/libopenssl/crypto/aes/asm/aes-sparcv9.pl
diff --git a/jni/openssl/crypto/aes/asm/aes-x86_64.pl b/jni/libopenssl/crypto/aes/asm/aes-x86_64.pl
similarity index 100%
rename from jni/openssl/crypto/aes/asm/aes-x86_64.pl
rename to jni/libopenssl/crypto/aes/asm/aes-x86_64.pl
diff --git a/jni/openssl/crypto/alphacpuid.pl b/jni/libopenssl/crypto/alphacpuid.pl
similarity index 100%
rename from jni/openssl/crypto/alphacpuid.pl
rename to jni/libopenssl/crypto/alphacpuid.pl
diff --git a/jni/openssl/crypto/asn1/a_bitstr.c b/jni/libopenssl/crypto/asn1/a_bitstr.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_bitstr.c
rename to jni/libopenssl/crypto/asn1/a_bitstr.c
diff --git a/jni/openssl/crypto/asn1/a_bool.c b/jni/libopenssl/crypto/asn1/a_bool.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_bool.c
rename to jni/libopenssl/crypto/asn1/a_bool.c
diff --git a/jni/openssl/crypto/asn1/a_bytes.c b/jni/libopenssl/crypto/asn1/a_bytes.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_bytes.c
rename to jni/libopenssl/crypto/asn1/a_bytes.c
diff --git a/jni/openssl/crypto/asn1/a_d2i_fp.c b/jni/libopenssl/crypto/asn1/a_d2i_fp.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_d2i_fp.c
rename to jni/libopenssl/crypto/asn1/a_d2i_fp.c
diff --git a/jni/openssl/crypto/asn1/a_digest.c b/jni/libopenssl/crypto/asn1/a_digest.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_digest.c
rename to jni/libopenssl/crypto/asn1/a_digest.c
diff --git a/jni/openssl/crypto/asn1/a_dup.c b/jni/libopenssl/crypto/asn1/a_dup.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_dup.c
rename to jni/libopenssl/crypto/asn1/a_dup.c
diff --git a/jni/openssl/crypto/asn1/a_enum.c b/jni/libopenssl/crypto/asn1/a_enum.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_enum.c
rename to jni/libopenssl/crypto/asn1/a_enum.c
diff --git a/jni/openssl/crypto/asn1/a_gentm.c b/jni/libopenssl/crypto/asn1/a_gentm.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_gentm.c
rename to jni/libopenssl/crypto/asn1/a_gentm.c
diff --git a/jni/openssl/crypto/asn1/a_i2d_fp.c b/jni/libopenssl/crypto/asn1/a_i2d_fp.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_i2d_fp.c
rename to jni/libopenssl/crypto/asn1/a_i2d_fp.c
diff --git a/jni/openssl/crypto/asn1/a_int.c b/jni/libopenssl/crypto/asn1/a_int.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_int.c
rename to jni/libopenssl/crypto/asn1/a_int.c
diff --git a/jni/openssl/crypto/asn1/a_mbstr.c b/jni/libopenssl/crypto/asn1/a_mbstr.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_mbstr.c
rename to jni/libopenssl/crypto/asn1/a_mbstr.c
diff --git a/jni/openssl/crypto/asn1/a_object.c b/jni/libopenssl/crypto/asn1/a_object.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_object.c
rename to jni/libopenssl/crypto/asn1/a_object.c
diff --git a/jni/openssl/crypto/asn1/a_octet.c b/jni/libopenssl/crypto/asn1/a_octet.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_octet.c
rename to jni/libopenssl/crypto/asn1/a_octet.c
diff --git a/jni/openssl/crypto/asn1/a_print.c b/jni/libopenssl/crypto/asn1/a_print.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_print.c
rename to jni/libopenssl/crypto/asn1/a_print.c
diff --git a/jni/openssl/crypto/asn1/a_set.c b/jni/libopenssl/crypto/asn1/a_set.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_set.c
rename to jni/libopenssl/crypto/asn1/a_set.c
diff --git a/jni/openssl/crypto/asn1/a_sign.c b/jni/libopenssl/crypto/asn1/a_sign.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_sign.c
rename to jni/libopenssl/crypto/asn1/a_sign.c
diff --git a/jni/openssl/crypto/asn1/a_strex.c b/jni/libopenssl/crypto/asn1/a_strex.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_strex.c
rename to jni/libopenssl/crypto/asn1/a_strex.c
diff --git a/jni/openssl/crypto/asn1/a_strnid.c b/jni/libopenssl/crypto/asn1/a_strnid.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_strnid.c
rename to jni/libopenssl/crypto/asn1/a_strnid.c
diff --git a/jni/openssl/crypto/asn1/a_time.c b/jni/libopenssl/crypto/asn1/a_time.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_time.c
rename to jni/libopenssl/crypto/asn1/a_time.c
diff --git a/jni/openssl/crypto/asn1/a_type.c b/jni/libopenssl/crypto/asn1/a_type.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_type.c
rename to jni/libopenssl/crypto/asn1/a_type.c
diff --git a/jni/openssl/crypto/asn1/a_utctm.c b/jni/libopenssl/crypto/asn1/a_utctm.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_utctm.c
rename to jni/libopenssl/crypto/asn1/a_utctm.c
diff --git a/jni/openssl/crypto/asn1/a_utf8.c b/jni/libopenssl/crypto/asn1/a_utf8.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_utf8.c
rename to jni/libopenssl/crypto/asn1/a_utf8.c
diff --git a/jni/openssl/crypto/asn1/a_verify.c b/jni/libopenssl/crypto/asn1/a_verify.c
similarity index 100%
rename from jni/openssl/crypto/asn1/a_verify.c
rename to jni/libopenssl/crypto/asn1/a_verify.c
diff --git a/jni/openssl/crypto/asn1/ameth_lib.c b/jni/libopenssl/crypto/asn1/ameth_lib.c
similarity index 100%
rename from jni/openssl/crypto/asn1/ameth_lib.c
rename to jni/libopenssl/crypto/asn1/ameth_lib.c
diff --git a/jni/openssl/crypto/asn1/asn1.h b/jni/libopenssl/crypto/asn1/asn1.h
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1.h
rename to jni/libopenssl/crypto/asn1/asn1.h
diff --git a/jni/openssl/crypto/asn1/asn1_err.c b/jni/libopenssl/crypto/asn1/asn1_err.c
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1_err.c
rename to jni/libopenssl/crypto/asn1/asn1_err.c
diff --git a/jni/openssl/crypto/asn1/asn1_gen.c b/jni/libopenssl/crypto/asn1/asn1_gen.c
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1_gen.c
rename to jni/libopenssl/crypto/asn1/asn1_gen.c
diff --git a/jni/openssl/crypto/asn1/asn1_lib.c b/jni/libopenssl/crypto/asn1/asn1_lib.c
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1_lib.c
rename to jni/libopenssl/crypto/asn1/asn1_lib.c
diff --git a/jni/openssl/crypto/asn1/asn1_locl.h b/jni/libopenssl/crypto/asn1/asn1_locl.h
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1_locl.h
rename to jni/libopenssl/crypto/asn1/asn1_locl.h
diff --git a/jni/openssl/crypto/asn1/asn1_mac.h b/jni/libopenssl/crypto/asn1/asn1_mac.h
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1_mac.h
rename to jni/libopenssl/crypto/asn1/asn1_mac.h
diff --git a/jni/openssl/crypto/asn1/asn1_par.c b/jni/libopenssl/crypto/asn1/asn1_par.c
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1_par.c
rename to jni/libopenssl/crypto/asn1/asn1_par.c
diff --git a/jni/openssl/crypto/asn1/asn1t.h b/jni/libopenssl/crypto/asn1/asn1t.h
similarity index 100%
rename from jni/openssl/crypto/asn1/asn1t.h
rename to jni/libopenssl/crypto/asn1/asn1t.h
diff --git a/jni/openssl/crypto/asn1/asn_mime.c b/jni/libopenssl/crypto/asn1/asn_mime.c
similarity index 100%
rename from jni/openssl/crypto/asn1/asn_mime.c
rename to jni/libopenssl/crypto/asn1/asn_mime.c
diff --git a/jni/openssl/crypto/asn1/asn_moid.c b/jni/libopenssl/crypto/asn1/asn_moid.c
similarity index 100%
rename from jni/openssl/crypto/asn1/asn_moid.c
rename to jni/libopenssl/crypto/asn1/asn_moid.c
diff --git a/jni/openssl/crypto/asn1/asn_pack.c b/jni/libopenssl/crypto/asn1/asn_pack.c
similarity index 100%
rename from jni/openssl/crypto/asn1/asn_pack.c
rename to jni/libopenssl/crypto/asn1/asn_pack.c
diff --git a/jni/openssl/crypto/asn1/bio_asn1.c b/jni/libopenssl/crypto/asn1/bio_asn1.c
similarity index 100%
rename from jni/openssl/crypto/asn1/bio_asn1.c
rename to jni/libopenssl/crypto/asn1/bio_asn1.c
diff --git a/jni/openssl/crypto/asn1/bio_ndef.c b/jni/libopenssl/crypto/asn1/bio_ndef.c
similarity index 100%
rename from jni/openssl/crypto/asn1/bio_ndef.c
rename to jni/libopenssl/crypto/asn1/bio_ndef.c
diff --git a/jni/openssl/crypto/asn1/charmap.h b/jni/libopenssl/crypto/asn1/charmap.h
similarity index 100%
rename from jni/openssl/crypto/asn1/charmap.h
rename to jni/libopenssl/crypto/asn1/charmap.h
diff --git a/jni/openssl/crypto/asn1/charmap.pl b/jni/libopenssl/crypto/asn1/charmap.pl
similarity index 100%
rename from jni/openssl/crypto/asn1/charmap.pl
rename to jni/libopenssl/crypto/asn1/charmap.pl
diff --git a/jni/openssl/crypto/asn1/d2i_pr.c b/jni/libopenssl/crypto/asn1/d2i_pr.c
similarity index 100%
rename from jni/openssl/crypto/asn1/d2i_pr.c
rename to jni/libopenssl/crypto/asn1/d2i_pr.c
diff --git a/jni/openssl/crypto/asn1/d2i_pu.c b/jni/libopenssl/crypto/asn1/d2i_pu.c
similarity index 100%
rename from jni/openssl/crypto/asn1/d2i_pu.c
rename to jni/libopenssl/crypto/asn1/d2i_pu.c
diff --git a/jni/openssl/crypto/asn1/evp_asn1.c b/jni/libopenssl/crypto/asn1/evp_asn1.c
similarity index 100%
rename from jni/openssl/crypto/asn1/evp_asn1.c
rename to jni/libopenssl/crypto/asn1/evp_asn1.c
diff --git a/jni/openssl/crypto/asn1/f_enum.c b/jni/libopenssl/crypto/asn1/f_enum.c
similarity index 100%
rename from jni/openssl/crypto/asn1/f_enum.c
rename to jni/libopenssl/crypto/asn1/f_enum.c
diff --git a/jni/openssl/crypto/asn1/f_int.c b/jni/libopenssl/crypto/asn1/f_int.c
similarity index 100%
rename from jni/openssl/crypto/asn1/f_int.c
rename to jni/libopenssl/crypto/asn1/f_int.c
diff --git a/jni/openssl/crypto/asn1/f_string.c b/jni/libopenssl/crypto/asn1/f_string.c
similarity index 100%
rename from jni/openssl/crypto/asn1/f_string.c
rename to jni/libopenssl/crypto/asn1/f_string.c
diff --git a/jni/openssl/crypto/asn1/i2d_pr.c b/jni/libopenssl/crypto/asn1/i2d_pr.c
similarity index 100%
rename from jni/openssl/crypto/asn1/i2d_pr.c
rename to jni/libopenssl/crypto/asn1/i2d_pr.c
diff --git a/jni/openssl/crypto/asn1/i2d_pu.c b/jni/libopenssl/crypto/asn1/i2d_pu.c
similarity index 100%
rename from jni/openssl/crypto/asn1/i2d_pu.c
rename to jni/libopenssl/crypto/asn1/i2d_pu.c
diff --git a/jni/openssl/crypto/asn1/n_pkey.c b/jni/libopenssl/crypto/asn1/n_pkey.c
similarity index 100%
rename from jni/openssl/crypto/asn1/n_pkey.c
rename to jni/libopenssl/crypto/asn1/n_pkey.c
diff --git a/jni/openssl/crypto/asn1/nsseq.c b/jni/libopenssl/crypto/asn1/nsseq.c
similarity index 100%
rename from jni/openssl/crypto/asn1/nsseq.c
rename to jni/libopenssl/crypto/asn1/nsseq.c
diff --git a/jni/openssl/crypto/asn1/p5_pbe.c b/jni/libopenssl/crypto/asn1/p5_pbe.c
similarity index 100%
rename from jni/openssl/crypto/asn1/p5_pbe.c
rename to jni/libopenssl/crypto/asn1/p5_pbe.c
diff --git a/jni/openssl/crypto/asn1/p5_pbev2.c b/jni/libopenssl/crypto/asn1/p5_pbev2.c
similarity index 100%
rename from jni/openssl/crypto/asn1/p5_pbev2.c
rename to jni/libopenssl/crypto/asn1/p5_pbev2.c
diff --git a/jni/openssl/crypto/asn1/p8_pkey.c b/jni/libopenssl/crypto/asn1/p8_pkey.c
similarity index 100%
rename from jni/openssl/crypto/asn1/p8_pkey.c
rename to jni/libopenssl/crypto/asn1/p8_pkey.c
diff --git a/jni/openssl/crypto/asn1/t_bitst.c b/jni/libopenssl/crypto/asn1/t_bitst.c
similarity index 100%
rename from jni/openssl/crypto/asn1/t_bitst.c
rename to jni/libopenssl/crypto/asn1/t_bitst.c
diff --git a/jni/openssl/crypto/asn1/t_crl.c b/jni/libopenssl/crypto/asn1/t_crl.c
similarity index 100%
rename from jni/openssl/crypto/asn1/t_crl.c
rename to jni/libopenssl/crypto/asn1/t_crl.c
diff --git a/jni/openssl/crypto/asn1/t_pkey.c b/jni/libopenssl/crypto/asn1/t_pkey.c
similarity index 100%
rename from jni/openssl/crypto/asn1/t_pkey.c
rename to jni/libopenssl/crypto/asn1/t_pkey.c
diff --git a/jni/openssl/crypto/asn1/t_req.c b/jni/libopenssl/crypto/asn1/t_req.c
similarity index 100%
rename from jni/openssl/crypto/asn1/t_req.c
rename to jni/libopenssl/crypto/asn1/t_req.c
diff --git a/jni/openssl/crypto/asn1/t_spki.c b/jni/libopenssl/crypto/asn1/t_spki.c
similarity index 100%
rename from jni/openssl/crypto/asn1/t_spki.c
rename to jni/libopenssl/crypto/asn1/t_spki.c
diff --git a/jni/openssl/crypto/asn1/t_x509.c b/jni/libopenssl/crypto/asn1/t_x509.c
similarity index 100%
rename from jni/openssl/crypto/asn1/t_x509.c
rename to jni/libopenssl/crypto/asn1/t_x509.c
diff --git a/jni/openssl/crypto/asn1/t_x509a.c b/jni/libopenssl/crypto/asn1/t_x509a.c
similarity index 100%
rename from jni/openssl/crypto/asn1/t_x509a.c
rename to jni/libopenssl/crypto/asn1/t_x509a.c
diff --git a/jni/openssl/crypto/asn1/tasn_dec.c b/jni/libopenssl/crypto/asn1/tasn_dec.c
similarity index 100%
rename from jni/openssl/crypto/asn1/tasn_dec.c
rename to jni/libopenssl/crypto/asn1/tasn_dec.c
diff --git a/jni/openssl/crypto/asn1/tasn_enc.c b/jni/libopenssl/crypto/asn1/tasn_enc.c
similarity index 100%
rename from jni/openssl/crypto/asn1/tasn_enc.c
rename to jni/libopenssl/crypto/asn1/tasn_enc.c
diff --git a/jni/openssl/crypto/asn1/tasn_fre.c b/jni/libopenssl/crypto/asn1/tasn_fre.c
similarity index 100%
rename from jni/openssl/crypto/asn1/tasn_fre.c
rename to jni/libopenssl/crypto/asn1/tasn_fre.c
diff --git a/jni/openssl/crypto/asn1/tasn_new.c b/jni/libopenssl/crypto/asn1/tasn_new.c
similarity index 100%
rename from jni/openssl/crypto/asn1/tasn_new.c
rename to jni/libopenssl/crypto/asn1/tasn_new.c
diff --git a/jni/openssl/crypto/asn1/tasn_prn.c b/jni/libopenssl/crypto/asn1/tasn_prn.c
similarity index 100%
rename from jni/openssl/crypto/asn1/tasn_prn.c
rename to jni/libopenssl/crypto/asn1/tasn_prn.c
diff --git a/jni/openssl/crypto/asn1/tasn_typ.c b/jni/libopenssl/crypto/asn1/tasn_typ.c
similarity index 100%
rename from jni/openssl/crypto/asn1/tasn_typ.c
rename to jni/libopenssl/crypto/asn1/tasn_typ.c
diff --git a/jni/openssl/crypto/asn1/tasn_utl.c b/jni/libopenssl/crypto/asn1/tasn_utl.c
similarity index 100%
rename from jni/openssl/crypto/asn1/tasn_utl.c
rename to jni/libopenssl/crypto/asn1/tasn_utl.c
diff --git a/jni/openssl/crypto/asn1/x_algor.c b/jni/libopenssl/crypto/asn1/x_algor.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_algor.c
rename to jni/libopenssl/crypto/asn1/x_algor.c
diff --git a/jni/openssl/crypto/asn1/x_attrib.c b/jni/libopenssl/crypto/asn1/x_attrib.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_attrib.c
rename to jni/libopenssl/crypto/asn1/x_attrib.c
diff --git a/jni/openssl/crypto/asn1/x_bignum.c b/jni/libopenssl/crypto/asn1/x_bignum.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_bignum.c
rename to jni/libopenssl/crypto/asn1/x_bignum.c
diff --git a/jni/openssl/crypto/asn1/x_crl.c b/jni/libopenssl/crypto/asn1/x_crl.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_crl.c
rename to jni/libopenssl/crypto/asn1/x_crl.c
diff --git a/jni/openssl/crypto/asn1/x_exten.c b/jni/libopenssl/crypto/asn1/x_exten.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_exten.c
rename to jni/libopenssl/crypto/asn1/x_exten.c
diff --git a/jni/openssl/crypto/asn1/x_info.c b/jni/libopenssl/crypto/asn1/x_info.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_info.c
rename to jni/libopenssl/crypto/asn1/x_info.c
diff --git a/jni/openssl/crypto/asn1/x_long.c b/jni/libopenssl/crypto/asn1/x_long.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_long.c
rename to jni/libopenssl/crypto/asn1/x_long.c
diff --git a/jni/openssl/crypto/asn1/x_name.c b/jni/libopenssl/crypto/asn1/x_name.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_name.c
rename to jni/libopenssl/crypto/asn1/x_name.c
diff --git a/jni/openssl/crypto/asn1/x_nx509.c b/jni/libopenssl/crypto/asn1/x_nx509.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_nx509.c
rename to jni/libopenssl/crypto/asn1/x_nx509.c
diff --git a/jni/openssl/crypto/asn1/x_pkey.c b/jni/libopenssl/crypto/asn1/x_pkey.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_pkey.c
rename to jni/libopenssl/crypto/asn1/x_pkey.c
diff --git a/jni/openssl/crypto/asn1/x_pubkey.c b/jni/libopenssl/crypto/asn1/x_pubkey.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_pubkey.c
rename to jni/libopenssl/crypto/asn1/x_pubkey.c
diff --git a/jni/openssl/crypto/asn1/x_req.c b/jni/libopenssl/crypto/asn1/x_req.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_req.c
rename to jni/libopenssl/crypto/asn1/x_req.c
diff --git a/jni/openssl/crypto/asn1/x_sig.c b/jni/libopenssl/crypto/asn1/x_sig.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_sig.c
rename to jni/libopenssl/crypto/asn1/x_sig.c
diff --git a/jni/openssl/crypto/asn1/x_spki.c b/jni/libopenssl/crypto/asn1/x_spki.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_spki.c
rename to jni/libopenssl/crypto/asn1/x_spki.c
diff --git a/jni/openssl/crypto/asn1/x_val.c b/jni/libopenssl/crypto/asn1/x_val.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_val.c
rename to jni/libopenssl/crypto/asn1/x_val.c
diff --git a/jni/openssl/crypto/asn1/x_x509.c b/jni/libopenssl/crypto/asn1/x_x509.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_x509.c
rename to jni/libopenssl/crypto/asn1/x_x509.c
diff --git a/jni/openssl/crypto/asn1/x_x509a.c b/jni/libopenssl/crypto/asn1/x_x509a.c
similarity index 100%
rename from jni/openssl/crypto/asn1/x_x509a.c
rename to jni/libopenssl/crypto/asn1/x_x509a.c
diff --git a/jni/openssl/crypto/bf/COPYRIGHT b/jni/libopenssl/crypto/bf/COPYRIGHT
similarity index 100%
rename from jni/openssl/crypto/bf/COPYRIGHT
rename to jni/libopenssl/crypto/bf/COPYRIGHT
diff --git a/jni/openssl/crypto/bf/asm/bf-586.pl b/jni/libopenssl/crypto/bf/asm/bf-586.pl
similarity index 100%
rename from jni/openssl/crypto/bf/asm/bf-586.pl
rename to jni/libopenssl/crypto/bf/asm/bf-586.pl
diff --git a/jni/openssl/crypto/bf/asm/bf-686.pl b/jni/libopenssl/crypto/bf/asm/bf-686.pl
similarity index 100%
rename from jni/openssl/crypto/bf/asm/bf-686.pl
rename to jni/libopenssl/crypto/bf/asm/bf-686.pl
diff --git a/jni/openssl/crypto/bf/bf_cfb64.c b/jni/libopenssl/crypto/bf/bf_cfb64.c
similarity index 100%
rename from jni/openssl/crypto/bf/bf_cfb64.c
rename to jni/libopenssl/crypto/bf/bf_cfb64.c
diff --git a/jni/openssl/crypto/bf/bf_ecb.c b/jni/libopenssl/crypto/bf/bf_ecb.c
similarity index 100%
rename from jni/openssl/crypto/bf/bf_ecb.c
rename to jni/libopenssl/crypto/bf/bf_ecb.c
diff --git a/jni/openssl/crypto/bf/bf_enc.c b/jni/libopenssl/crypto/bf/bf_enc.c
similarity index 100%
rename from jni/openssl/crypto/bf/bf_enc.c
rename to jni/libopenssl/crypto/bf/bf_enc.c
diff --git a/jni/openssl/crypto/bf/bf_locl.h b/jni/libopenssl/crypto/bf/bf_locl.h
similarity index 100%
rename from jni/openssl/crypto/bf/bf_locl.h
rename to jni/libopenssl/crypto/bf/bf_locl.h
diff --git a/jni/openssl/crypto/bf/bf_ofb64.c b/jni/libopenssl/crypto/bf/bf_ofb64.c
similarity index 100%
rename from jni/openssl/crypto/bf/bf_ofb64.c
rename to jni/libopenssl/crypto/bf/bf_ofb64.c
diff --git a/jni/openssl/crypto/bf/bf_pi.h b/jni/libopenssl/crypto/bf/bf_pi.h
similarity index 100%
rename from jni/openssl/crypto/bf/bf_pi.h
rename to jni/libopenssl/crypto/bf/bf_pi.h
diff --git a/jni/openssl/crypto/bf/bf_skey.c b/jni/libopenssl/crypto/bf/bf_skey.c
similarity index 100%
rename from jni/openssl/crypto/bf/bf_skey.c
rename to jni/libopenssl/crypto/bf/bf_skey.c
diff --git a/jni/openssl/crypto/bf/blowfish.h b/jni/libopenssl/crypto/bf/blowfish.h
similarity index 100%
rename from jni/openssl/crypto/bf/blowfish.h
rename to jni/libopenssl/crypto/bf/blowfish.h
diff --git a/jni/openssl/crypto/bio/b_dump.c b/jni/libopenssl/crypto/bio/b_dump.c
similarity index 100%
rename from jni/openssl/crypto/bio/b_dump.c
rename to jni/libopenssl/crypto/bio/b_dump.c
diff --git a/jni/openssl/crypto/bio/b_print.c b/jni/libopenssl/crypto/bio/b_print.c
similarity index 100%
rename from jni/openssl/crypto/bio/b_print.c
rename to jni/libopenssl/crypto/bio/b_print.c
diff --git a/jni/openssl/crypto/bio/b_sock.c b/jni/libopenssl/crypto/bio/b_sock.c
similarity index 100%
rename from jni/openssl/crypto/bio/b_sock.c
rename to jni/libopenssl/crypto/bio/b_sock.c
diff --git a/jni/openssl/crypto/bio/bf_buff.c b/jni/libopenssl/crypto/bio/bf_buff.c
similarity index 100%
rename from jni/openssl/crypto/bio/bf_buff.c
rename to jni/libopenssl/crypto/bio/bf_buff.c
diff --git a/jni/openssl/crypto/bio/bf_lbuf.c b/jni/libopenssl/crypto/bio/bf_lbuf.c
similarity index 100%
rename from jni/openssl/crypto/bio/bf_lbuf.c
rename to jni/libopenssl/crypto/bio/bf_lbuf.c
diff --git a/jni/openssl/crypto/bio/bf_nbio.c b/jni/libopenssl/crypto/bio/bf_nbio.c
similarity index 100%
rename from jni/openssl/crypto/bio/bf_nbio.c
rename to jni/libopenssl/crypto/bio/bf_nbio.c
diff --git a/jni/openssl/crypto/bio/bf_null.c b/jni/libopenssl/crypto/bio/bf_null.c
similarity index 100%
rename from jni/openssl/crypto/bio/bf_null.c
rename to jni/libopenssl/crypto/bio/bf_null.c
diff --git a/jni/openssl/crypto/bio/bio.h b/jni/libopenssl/crypto/bio/bio.h
similarity index 100%
rename from jni/openssl/crypto/bio/bio.h
rename to jni/libopenssl/crypto/bio/bio.h
diff --git a/jni/openssl/crypto/bio/bio_cb.c b/jni/libopenssl/crypto/bio/bio_cb.c
similarity index 100%
rename from jni/openssl/crypto/bio/bio_cb.c
rename to jni/libopenssl/crypto/bio/bio_cb.c
diff --git a/jni/openssl/crypto/bio/bio_err.c b/jni/libopenssl/crypto/bio/bio_err.c
similarity index 100%
rename from jni/openssl/crypto/bio/bio_err.c
rename to jni/libopenssl/crypto/bio/bio_err.c
diff --git a/jni/openssl/crypto/bio/bio_lcl.h b/jni/libopenssl/crypto/bio/bio_lcl.h
similarity index 100%
rename from jni/openssl/crypto/bio/bio_lcl.h
rename to jni/libopenssl/crypto/bio/bio_lcl.h
diff --git a/jni/openssl/crypto/bio/bio_lib.c b/jni/libopenssl/crypto/bio/bio_lib.c
similarity index 100%
rename from jni/openssl/crypto/bio/bio_lib.c
rename to jni/libopenssl/crypto/bio/bio_lib.c
diff --git a/jni/openssl/crypto/bio/bss_acpt.c b/jni/libopenssl/crypto/bio/bss_acpt.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_acpt.c
rename to jni/libopenssl/crypto/bio/bss_acpt.c
diff --git a/jni/openssl/crypto/bio/bss_bio.c b/jni/libopenssl/crypto/bio/bss_bio.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_bio.c
rename to jni/libopenssl/crypto/bio/bss_bio.c
diff --git a/jni/openssl/crypto/bio/bss_conn.c b/jni/libopenssl/crypto/bio/bss_conn.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_conn.c
rename to jni/libopenssl/crypto/bio/bss_conn.c
diff --git a/jni/openssl/crypto/bio/bss_dgram.c b/jni/libopenssl/crypto/bio/bss_dgram.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_dgram.c
rename to jni/libopenssl/crypto/bio/bss_dgram.c
diff --git a/jni/openssl/crypto/bio/bss_fd.c b/jni/libopenssl/crypto/bio/bss_fd.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_fd.c
rename to jni/libopenssl/crypto/bio/bss_fd.c
diff --git a/jni/openssl/crypto/bio/bss_file.c b/jni/libopenssl/crypto/bio/bss_file.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_file.c
rename to jni/libopenssl/crypto/bio/bss_file.c
diff --git a/jni/openssl/crypto/bio/bss_log.c b/jni/libopenssl/crypto/bio/bss_log.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_log.c
rename to jni/libopenssl/crypto/bio/bss_log.c
diff --git a/jni/openssl/crypto/bio/bss_mem.c b/jni/libopenssl/crypto/bio/bss_mem.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_mem.c
rename to jni/libopenssl/crypto/bio/bss_mem.c
diff --git a/jni/openssl/crypto/bio/bss_null.c b/jni/libopenssl/crypto/bio/bss_null.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_null.c
rename to jni/libopenssl/crypto/bio/bss_null.c
diff --git a/jni/openssl/crypto/bio/bss_sock.c b/jni/libopenssl/crypto/bio/bss_sock.c
similarity index 100%
rename from jni/openssl/crypto/bio/bss_sock.c
rename to jni/libopenssl/crypto/bio/bss_sock.c
diff --git a/jni/openssl/crypto/bn/asm/README b/jni/libopenssl/crypto/bn/asm/README
similarity index 100%
rename from jni/openssl/crypto/bn/asm/README
rename to jni/libopenssl/crypto/bn/asm/README
diff --git a/jni/openssl/crypto/bn/asm/alpha-mont.pl b/jni/libopenssl/crypto/bn/asm/alpha-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/alpha-mont.pl
rename to jni/libopenssl/crypto/bn/asm/alpha-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/armv4-mont.pl b/jni/libopenssl/crypto/bn/asm/armv4-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/armv4-mont.pl
rename to jni/libopenssl/crypto/bn/asm/armv4-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/armv4-mont.s b/jni/libopenssl/crypto/bn/asm/armv4-mont.s
similarity index 100%
rename from jni/openssl/crypto/bn/asm/armv4-mont.s
rename to jni/libopenssl/crypto/bn/asm/armv4-mont.s
diff --git a/jni/openssl/crypto/bn/asm/bn-586.pl b/jni/libopenssl/crypto/bn/asm/bn-586.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/bn-586.pl
rename to jni/libopenssl/crypto/bn/asm/bn-586.pl
diff --git a/jni/openssl/crypto/bn/asm/co-586.pl b/jni/libopenssl/crypto/bn/asm/co-586.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/co-586.pl
rename to jni/libopenssl/crypto/bn/asm/co-586.pl
diff --git a/jni/openssl/crypto/bn/asm/ia64.S b/jni/libopenssl/crypto/bn/asm/ia64.S
similarity index 100%
rename from jni/openssl/crypto/bn/asm/ia64.S
rename to jni/libopenssl/crypto/bn/asm/ia64.S
diff --git a/jni/openssl/crypto/bn/asm/mips3-mont.pl b/jni/libopenssl/crypto/bn/asm/mips3-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/mips3-mont.pl
rename to jni/libopenssl/crypto/bn/asm/mips3-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/mips3.s b/jni/libopenssl/crypto/bn/asm/mips3.s
similarity index 100%
rename from jni/openssl/crypto/bn/asm/mips3.s
rename to jni/libopenssl/crypto/bn/asm/mips3.s
diff --git a/jni/openssl/crypto/bn/asm/pa-risc2.s b/jni/libopenssl/crypto/bn/asm/pa-risc2.s
similarity index 100%
rename from jni/openssl/crypto/bn/asm/pa-risc2.s
rename to jni/libopenssl/crypto/bn/asm/pa-risc2.s
diff --git a/jni/openssl/crypto/bn/asm/pa-risc2W.s b/jni/libopenssl/crypto/bn/asm/pa-risc2W.s
similarity index 100%
rename from jni/openssl/crypto/bn/asm/pa-risc2W.s
rename to jni/libopenssl/crypto/bn/asm/pa-risc2W.s
diff --git a/jni/openssl/crypto/bn/asm/ppc-mont.pl b/jni/libopenssl/crypto/bn/asm/ppc-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/ppc-mont.pl
rename to jni/libopenssl/crypto/bn/asm/ppc-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/ppc.pl b/jni/libopenssl/crypto/bn/asm/ppc.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/ppc.pl
rename to jni/libopenssl/crypto/bn/asm/ppc.pl
diff --git a/jni/openssl/crypto/bn/asm/ppc64-mont.pl b/jni/libopenssl/crypto/bn/asm/ppc64-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/ppc64-mont.pl
rename to jni/libopenssl/crypto/bn/asm/ppc64-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/s390x-mont.pl b/jni/libopenssl/crypto/bn/asm/s390x-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/s390x-mont.pl
rename to jni/libopenssl/crypto/bn/asm/s390x-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/s390x.S b/jni/libopenssl/crypto/bn/asm/s390x.S
similarity index 100%
rename from jni/openssl/crypto/bn/asm/s390x.S
rename to jni/libopenssl/crypto/bn/asm/s390x.S
diff --git a/jni/openssl/crypto/bn/asm/sparcv8.S b/jni/libopenssl/crypto/bn/asm/sparcv8.S
similarity index 100%
rename from jni/openssl/crypto/bn/asm/sparcv8.S
rename to jni/libopenssl/crypto/bn/asm/sparcv8.S
diff --git a/jni/openssl/crypto/bn/asm/sparcv8plus.S b/jni/libopenssl/crypto/bn/asm/sparcv8plus.S
similarity index 100%
rename from jni/openssl/crypto/bn/asm/sparcv8plus.S
rename to jni/libopenssl/crypto/bn/asm/sparcv8plus.S
diff --git a/jni/openssl/crypto/bn/asm/sparcv9-mont.pl b/jni/libopenssl/crypto/bn/asm/sparcv9-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/sparcv9-mont.pl
rename to jni/libopenssl/crypto/bn/asm/sparcv9-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/sparcv9a-mont.pl b/jni/libopenssl/crypto/bn/asm/sparcv9a-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/sparcv9a-mont.pl
rename to jni/libopenssl/crypto/bn/asm/sparcv9a-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/via-mont.pl b/jni/libopenssl/crypto/bn/asm/via-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/via-mont.pl
rename to jni/libopenssl/crypto/bn/asm/via-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/x86-mont.pl b/jni/libopenssl/crypto/bn/asm/x86-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86-mont.pl
rename to jni/libopenssl/crypto/bn/asm/x86-mont.pl
diff --git a/jni/openssl/crypto/bn/asm/x86.pl b/jni/libopenssl/crypto/bn/asm/x86.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86.pl
rename to jni/libopenssl/crypto/bn/asm/x86.pl
diff --git a/jni/openssl/crypto/bn/asm/x86/add.pl b/jni/libopenssl/crypto/bn/asm/x86/add.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/add.pl
rename to jni/libopenssl/crypto/bn/asm/x86/add.pl
diff --git a/jni/openssl/crypto/bn/asm/x86/comba.pl b/jni/libopenssl/crypto/bn/asm/x86/comba.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/comba.pl
rename to jni/libopenssl/crypto/bn/asm/x86/comba.pl
diff --git a/jni/openssl/crypto/bn/asm/x86/div.pl b/jni/libopenssl/crypto/bn/asm/x86/div.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/div.pl
rename to jni/libopenssl/crypto/bn/asm/x86/div.pl
diff --git a/jni/openssl/crypto/bn/asm/x86/f b/jni/libopenssl/crypto/bn/asm/x86/f
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/f
rename to jni/libopenssl/crypto/bn/asm/x86/f
diff --git a/jni/openssl/crypto/bn/asm/x86/mul.pl b/jni/libopenssl/crypto/bn/asm/x86/mul.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/mul.pl
rename to jni/libopenssl/crypto/bn/asm/x86/mul.pl
diff --git a/jni/openssl/crypto/bn/asm/x86/mul_add.pl b/jni/libopenssl/crypto/bn/asm/x86/mul_add.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/mul_add.pl
rename to jni/libopenssl/crypto/bn/asm/x86/mul_add.pl
diff --git a/jni/openssl/crypto/bn/asm/x86/sqr.pl b/jni/libopenssl/crypto/bn/asm/x86/sqr.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/sqr.pl
rename to jni/libopenssl/crypto/bn/asm/x86/sqr.pl
diff --git a/jni/openssl/crypto/bn/asm/x86/sub.pl b/jni/libopenssl/crypto/bn/asm/x86/sub.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86/sub.pl
rename to jni/libopenssl/crypto/bn/asm/x86/sub.pl
diff --git a/jni/openssl/crypto/bn/asm/x86_64-gcc.c b/jni/libopenssl/crypto/bn/asm/x86_64-gcc.c
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86_64-gcc.c
rename to jni/libopenssl/crypto/bn/asm/x86_64-gcc.c
diff --git a/jni/openssl/crypto/bn/asm/x86_64-mont.pl b/jni/libopenssl/crypto/bn/asm/x86_64-mont.pl
similarity index 100%
rename from jni/openssl/crypto/bn/asm/x86_64-mont.pl
rename to jni/libopenssl/crypto/bn/asm/x86_64-mont.pl
diff --git a/jni/openssl/crypto/bn/bn.h b/jni/libopenssl/crypto/bn/bn.h
similarity index 100%
rename from jni/openssl/crypto/bn/bn.h
rename to jni/libopenssl/crypto/bn/bn.h
diff --git a/jni/openssl/crypto/bn/bn.mul b/jni/libopenssl/crypto/bn/bn.mul
similarity index 100%
rename from jni/openssl/crypto/bn/bn.mul
rename to jni/libopenssl/crypto/bn/bn.mul
diff --git a/jni/openssl/crypto/bn/bn_add.c b/jni/libopenssl/crypto/bn/bn_add.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_add.c
rename to jni/libopenssl/crypto/bn/bn_add.c
diff --git a/jni/openssl/crypto/bn/bn_asm.c b/jni/libopenssl/crypto/bn/bn_asm.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_asm.c
rename to jni/libopenssl/crypto/bn/bn_asm.c
diff --git a/jni/openssl/crypto/bn/bn_blind.c b/jni/libopenssl/crypto/bn/bn_blind.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_blind.c
rename to jni/libopenssl/crypto/bn/bn_blind.c
diff --git a/jni/openssl/crypto/bn/bn_const.c b/jni/libopenssl/crypto/bn/bn_const.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_const.c
rename to jni/libopenssl/crypto/bn/bn_const.c
diff --git a/jni/openssl/crypto/bn/bn_ctx.c b/jni/libopenssl/crypto/bn/bn_ctx.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_ctx.c
rename to jni/libopenssl/crypto/bn/bn_ctx.c
diff --git a/jni/openssl/crypto/bn/bn_depr.c b/jni/libopenssl/crypto/bn/bn_depr.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_depr.c
rename to jni/libopenssl/crypto/bn/bn_depr.c
diff --git a/jni/openssl/crypto/bn/bn_div.c b/jni/libopenssl/crypto/bn/bn_div.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_div.c
rename to jni/libopenssl/crypto/bn/bn_div.c
diff --git a/jni/openssl/crypto/bn/bn_err.c b/jni/libopenssl/crypto/bn/bn_err.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_err.c
rename to jni/libopenssl/crypto/bn/bn_err.c
diff --git a/jni/openssl/crypto/bn/bn_exp.c b/jni/libopenssl/crypto/bn/bn_exp.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_exp.c
rename to jni/libopenssl/crypto/bn/bn_exp.c
diff --git a/jni/openssl/crypto/bn/bn_exp2.c b/jni/libopenssl/crypto/bn/bn_exp2.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_exp2.c
rename to jni/libopenssl/crypto/bn/bn_exp2.c
diff --git a/jni/openssl/crypto/bn/bn_gcd.c b/jni/libopenssl/crypto/bn/bn_gcd.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_gcd.c
rename to jni/libopenssl/crypto/bn/bn_gcd.c
diff --git a/jni/openssl/crypto/bn/bn_gf2m.c b/jni/libopenssl/crypto/bn/bn_gf2m.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_gf2m.c
rename to jni/libopenssl/crypto/bn/bn_gf2m.c
diff --git a/jni/openssl/crypto/bn/bn_kron.c b/jni/libopenssl/crypto/bn/bn_kron.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_kron.c
rename to jni/libopenssl/crypto/bn/bn_kron.c
diff --git a/jni/openssl/crypto/bn/bn_lcl.h b/jni/libopenssl/crypto/bn/bn_lcl.h
similarity index 100%
rename from jni/openssl/crypto/bn/bn_lcl.h
rename to jni/libopenssl/crypto/bn/bn_lcl.h
diff --git a/jni/openssl/crypto/bn/bn_lib.c b/jni/libopenssl/crypto/bn/bn_lib.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_lib.c
rename to jni/libopenssl/crypto/bn/bn_lib.c
diff --git a/jni/openssl/crypto/bn/bn_mod.c b/jni/libopenssl/crypto/bn/bn_mod.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_mod.c
rename to jni/libopenssl/crypto/bn/bn_mod.c
diff --git a/jni/openssl/crypto/bn/bn_mont.c b/jni/libopenssl/crypto/bn/bn_mont.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_mont.c
rename to jni/libopenssl/crypto/bn/bn_mont.c
diff --git a/jni/openssl/crypto/bn/bn_mpi.c b/jni/libopenssl/crypto/bn/bn_mpi.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_mpi.c
rename to jni/libopenssl/crypto/bn/bn_mpi.c
diff --git a/jni/openssl/crypto/bn/bn_mul.c b/jni/libopenssl/crypto/bn/bn_mul.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_mul.c
rename to jni/libopenssl/crypto/bn/bn_mul.c
diff --git a/jni/openssl/crypto/bn/bn_nist.c b/jni/libopenssl/crypto/bn/bn_nist.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_nist.c
rename to jni/libopenssl/crypto/bn/bn_nist.c
diff --git a/jni/openssl/crypto/bn/bn_prime.c b/jni/libopenssl/crypto/bn/bn_prime.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_prime.c
rename to jni/libopenssl/crypto/bn/bn_prime.c
diff --git a/jni/openssl/crypto/bn/bn_prime.h b/jni/libopenssl/crypto/bn/bn_prime.h
similarity index 100%
rename from jni/openssl/crypto/bn/bn_prime.h
rename to jni/libopenssl/crypto/bn/bn_prime.h
diff --git a/jni/openssl/crypto/bn/bn_prime.pl b/jni/libopenssl/crypto/bn/bn_prime.pl
similarity index 100%
rename from jni/openssl/crypto/bn/bn_prime.pl
rename to jni/libopenssl/crypto/bn/bn_prime.pl
diff --git a/jni/openssl/crypto/bn/bn_print.c b/jni/libopenssl/crypto/bn/bn_print.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_print.c
rename to jni/libopenssl/crypto/bn/bn_print.c
diff --git a/jni/openssl/crypto/bn/bn_rand.c b/jni/libopenssl/crypto/bn/bn_rand.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_rand.c
rename to jni/libopenssl/crypto/bn/bn_rand.c
diff --git a/jni/openssl/crypto/bn/bn_recp.c b/jni/libopenssl/crypto/bn/bn_recp.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_recp.c
rename to jni/libopenssl/crypto/bn/bn_recp.c
diff --git a/jni/openssl/crypto/bn/bn_shift.c b/jni/libopenssl/crypto/bn/bn_shift.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_shift.c
rename to jni/libopenssl/crypto/bn/bn_shift.c
diff --git a/jni/openssl/crypto/bn/bn_sqr.c b/jni/libopenssl/crypto/bn/bn_sqr.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_sqr.c
rename to jni/libopenssl/crypto/bn/bn_sqr.c
diff --git a/jni/openssl/crypto/bn/bn_sqrt.c b/jni/libopenssl/crypto/bn/bn_sqrt.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_sqrt.c
rename to jni/libopenssl/crypto/bn/bn_sqrt.c
diff --git a/jni/openssl/crypto/bn/bn_word.c b/jni/libopenssl/crypto/bn/bn_word.c
similarity index 100%
rename from jni/openssl/crypto/bn/bn_word.c
rename to jni/libopenssl/crypto/bn/bn_word.c
diff --git a/jni/openssl/crypto/bn/bnspeed.c b/jni/libopenssl/crypto/bn/bnspeed.c
similarity index 100%
rename from jni/openssl/crypto/bn/bnspeed.c
rename to jni/libopenssl/crypto/bn/bnspeed.c
diff --git a/jni/openssl/crypto/bn/bntest.c b/jni/libopenssl/crypto/bn/bntest.c
similarity index 100%
rename from jni/openssl/crypto/bn/bntest.c
rename to jni/libopenssl/crypto/bn/bntest.c
diff --git a/jni/openssl/crypto/bn/divtest.c b/jni/libopenssl/crypto/bn/divtest.c
similarity index 100%
rename from jni/openssl/crypto/bn/divtest.c
rename to jni/libopenssl/crypto/bn/divtest.c
diff --git a/jni/openssl/crypto/bn/exp.c b/jni/libopenssl/crypto/bn/exp.c
similarity index 100%
rename from jni/openssl/crypto/bn/exp.c
rename to jni/libopenssl/crypto/bn/exp.c
diff --git a/jni/openssl/crypto/bn/expspeed.c b/jni/libopenssl/crypto/bn/expspeed.c
similarity index 100%
rename from jni/openssl/crypto/bn/expspeed.c
rename to jni/libopenssl/crypto/bn/expspeed.c
diff --git a/jni/openssl/crypto/bn/exptest.c b/jni/libopenssl/crypto/bn/exptest.c
similarity index 100%
rename from jni/openssl/crypto/bn/exptest.c
rename to jni/libopenssl/crypto/bn/exptest.c
diff --git a/jni/openssl/crypto/bn/todo b/jni/libopenssl/crypto/bn/todo
similarity index 100%
rename from jni/openssl/crypto/bn/todo
rename to jni/libopenssl/crypto/bn/todo
diff --git a/jni/openssl/crypto/buffer/buf_err.c b/jni/libopenssl/crypto/buffer/buf_err.c
similarity index 100%
rename from jni/openssl/crypto/buffer/buf_err.c
rename to jni/libopenssl/crypto/buffer/buf_err.c
diff --git a/jni/openssl/crypto/buffer/buffer.c b/jni/libopenssl/crypto/buffer/buffer.c
similarity index 100%
rename from jni/openssl/crypto/buffer/buffer.c
rename to jni/libopenssl/crypto/buffer/buffer.c
diff --git a/jni/openssl/crypto/buffer/buffer.h b/jni/libopenssl/crypto/buffer/buffer.h
similarity index 100%
rename from jni/openssl/crypto/buffer/buffer.h
rename to jni/libopenssl/crypto/buffer/buffer.h
diff --git a/jni/openssl/crypto/comp/c_rle.c b/jni/libopenssl/crypto/comp/c_rle.c
similarity index 100%
rename from jni/openssl/crypto/comp/c_rle.c
rename to jni/libopenssl/crypto/comp/c_rle.c
diff --git a/jni/openssl/crypto/comp/c_zlib.c b/jni/libopenssl/crypto/comp/c_zlib.c
similarity index 100%
rename from jni/openssl/crypto/comp/c_zlib.c
rename to jni/libopenssl/crypto/comp/c_zlib.c
diff --git a/jni/openssl/crypto/comp/comp.h b/jni/libopenssl/crypto/comp/comp.h
similarity index 100%
rename from jni/openssl/crypto/comp/comp.h
rename to jni/libopenssl/crypto/comp/comp.h
diff --git a/jni/openssl/crypto/comp/comp_err.c b/jni/libopenssl/crypto/comp/comp_err.c
similarity index 100%
rename from jni/openssl/crypto/comp/comp_err.c
rename to jni/libopenssl/crypto/comp/comp_err.c
diff --git a/jni/openssl/crypto/comp/comp_lib.c b/jni/libopenssl/crypto/comp/comp_lib.c
similarity index 100%
rename from jni/openssl/crypto/comp/comp_lib.c
rename to jni/libopenssl/crypto/comp/comp_lib.c
diff --git a/jni/openssl/crypto/conf/README b/jni/libopenssl/crypto/conf/README
similarity index 100%
rename from jni/openssl/crypto/conf/README
rename to jni/libopenssl/crypto/conf/README
diff --git a/jni/openssl/crypto/conf/cnf_save.c b/jni/libopenssl/crypto/conf/cnf_save.c
similarity index 100%
rename from jni/openssl/crypto/conf/cnf_save.c
rename to jni/libopenssl/crypto/conf/cnf_save.c
diff --git a/jni/openssl/crypto/conf/conf.h b/jni/libopenssl/crypto/conf/conf.h
similarity index 100%
rename from jni/openssl/crypto/conf/conf.h
rename to jni/libopenssl/crypto/conf/conf.h
diff --git a/jni/openssl/crypto/conf/conf_api.c b/jni/libopenssl/crypto/conf/conf_api.c
similarity index 100%
rename from jni/openssl/crypto/conf/conf_api.c
rename to jni/libopenssl/crypto/conf/conf_api.c
diff --git a/jni/openssl/crypto/conf/conf_api.h b/jni/libopenssl/crypto/conf/conf_api.h
similarity index 100%
rename from jni/openssl/crypto/conf/conf_api.h
rename to jni/libopenssl/crypto/conf/conf_api.h
diff --git a/jni/openssl/crypto/conf/conf_def.c b/jni/libopenssl/crypto/conf/conf_def.c
similarity index 100%
rename from jni/openssl/crypto/conf/conf_def.c
rename to jni/libopenssl/crypto/conf/conf_def.c
diff --git a/jni/openssl/crypto/conf/conf_def.h b/jni/libopenssl/crypto/conf/conf_def.h
similarity index 100%
rename from jni/openssl/crypto/conf/conf_def.h
rename to jni/libopenssl/crypto/conf/conf_def.h
diff --git a/jni/openssl/crypto/conf/conf_err.c b/jni/libopenssl/crypto/conf/conf_err.c
similarity index 100%
rename from jni/openssl/crypto/conf/conf_err.c
rename to jni/libopenssl/crypto/conf/conf_err.c
diff --git a/jni/openssl/crypto/conf/conf_lib.c b/jni/libopenssl/crypto/conf/conf_lib.c
similarity index 100%
rename from jni/openssl/crypto/conf/conf_lib.c
rename to jni/libopenssl/crypto/conf/conf_lib.c
diff --git a/jni/openssl/crypto/conf/conf_mall.c b/jni/libopenssl/crypto/conf/conf_mall.c
similarity index 100%
rename from jni/openssl/crypto/conf/conf_mall.c
rename to jni/libopenssl/crypto/conf/conf_mall.c
diff --git a/jni/openssl/crypto/conf/conf_mod.c b/jni/libopenssl/crypto/conf/conf_mod.c
similarity index 100%
rename from jni/openssl/crypto/conf/conf_mod.c
rename to jni/libopenssl/crypto/conf/conf_mod.c
diff --git a/jni/openssl/crypto/conf/conf_sap.c b/jni/libopenssl/crypto/conf/conf_sap.c
similarity index 100%
rename from jni/openssl/crypto/conf/conf_sap.c
rename to jni/libopenssl/crypto/conf/conf_sap.c
diff --git a/jni/openssl/crypto/conf/keysets.pl b/jni/libopenssl/crypto/conf/keysets.pl
similarity index 100%
rename from jni/openssl/crypto/conf/keysets.pl
rename to jni/libopenssl/crypto/conf/keysets.pl
diff --git a/jni/openssl/crypto/conf/ssleay.cnf b/jni/libopenssl/crypto/conf/ssleay.cnf
similarity index 100%
rename from jni/openssl/crypto/conf/ssleay.cnf
rename to jni/libopenssl/crypto/conf/ssleay.cnf
diff --git a/jni/openssl/crypto/conf/test.c b/jni/libopenssl/crypto/conf/test.c
similarity index 100%
rename from jni/openssl/crypto/conf/test.c
rename to jni/libopenssl/crypto/conf/test.c
diff --git a/jni/openssl/crypto/cpt_err.c b/jni/libopenssl/crypto/cpt_err.c
similarity index 100%
rename from jni/openssl/crypto/cpt_err.c
rename to jni/libopenssl/crypto/cpt_err.c
diff --git a/jni/openssl/crypto/cryptlib.c b/jni/libopenssl/crypto/cryptlib.c
similarity index 100%
rename from jni/openssl/crypto/cryptlib.c
rename to jni/libopenssl/crypto/cryptlib.c
diff --git a/jni/openssl/crypto/cryptlib.h b/jni/libopenssl/crypto/cryptlib.h
similarity index 100%
rename from jni/openssl/crypto/cryptlib.h
rename to jni/libopenssl/crypto/cryptlib.h
diff --git a/jni/openssl/crypto/crypto.h b/jni/libopenssl/crypto/crypto.h
similarity index 100%
rename from jni/openssl/crypto/crypto.h
rename to jni/libopenssl/crypto/crypto.h
diff --git a/jni/openssl/crypto/cversion.c b/jni/libopenssl/crypto/cversion.c
similarity index 100%
rename from jni/openssl/crypto/cversion.c
rename to jni/libopenssl/crypto/cversion.c
diff --git a/jni/openssl/crypto/des/COPYRIGHT b/jni/libopenssl/crypto/des/COPYRIGHT
similarity index 100%
rename from jni/openssl/crypto/des/COPYRIGHT
rename to jni/libopenssl/crypto/des/COPYRIGHT
diff --git a/jni/openssl/crypto/des/DES.pm b/jni/libopenssl/crypto/des/DES.pm
similarity index 100%
rename from jni/openssl/crypto/des/DES.pm
rename to jni/libopenssl/crypto/des/DES.pm
diff --git a/jni/openssl/crypto/des/DES.xs b/jni/libopenssl/crypto/des/DES.xs
similarity index 100%
rename from jni/openssl/crypto/des/DES.xs
rename to jni/libopenssl/crypto/des/DES.xs
diff --git a/jni/openssl/crypto/des/FILES0 b/jni/libopenssl/crypto/des/FILES0
similarity index 100%
rename from jni/openssl/crypto/des/FILES0
rename to jni/libopenssl/crypto/des/FILES0
diff --git a/jni/openssl/crypto/des/INSTALL b/jni/libopenssl/crypto/des/INSTALL
similarity index 100%
rename from jni/openssl/crypto/des/INSTALL
rename to jni/libopenssl/crypto/des/INSTALL
diff --git a/jni/openssl/crypto/des/Imakefile b/jni/libopenssl/crypto/des/Imakefile
similarity index 100%
rename from jni/openssl/crypto/des/Imakefile
rename to jni/libopenssl/crypto/des/Imakefile
diff --git a/jni/openssl/crypto/des/KERBEROS b/jni/libopenssl/crypto/des/KERBEROS
similarity index 100%
rename from jni/openssl/crypto/des/KERBEROS
rename to jni/libopenssl/crypto/des/KERBEROS
diff --git a/jni/openssl/crypto/des/README b/jni/libopenssl/crypto/des/README
similarity index 100%
rename from jni/openssl/crypto/des/README
rename to jni/libopenssl/crypto/des/README
diff --git a/jni/openssl/crypto/des/VERSION b/jni/libopenssl/crypto/des/VERSION
similarity index 100%
rename from jni/openssl/crypto/des/VERSION
rename to jni/libopenssl/crypto/des/VERSION
diff --git a/jni/openssl/crypto/des/asm/crypt586.pl b/jni/libopenssl/crypto/des/asm/crypt586.pl
similarity index 100%
rename from jni/openssl/crypto/des/asm/crypt586.pl
rename to jni/libopenssl/crypto/des/asm/crypt586.pl
diff --git a/jni/openssl/crypto/des/asm/des-586.pl b/jni/libopenssl/crypto/des/asm/des-586.pl
similarity index 100%
rename from jni/openssl/crypto/des/asm/des-586.pl
rename to jni/libopenssl/crypto/des/asm/des-586.pl
diff --git a/jni/openssl/crypto/des/asm/des_enc.m4 b/jni/libopenssl/crypto/des/asm/des_enc.m4
similarity index 100%
rename from jni/openssl/crypto/des/asm/des_enc.m4
rename to jni/libopenssl/crypto/des/asm/des_enc.m4
diff --git a/jni/openssl/crypto/des/asm/desboth.pl b/jni/libopenssl/crypto/des/asm/desboth.pl
similarity index 100%
rename from jni/openssl/crypto/des/asm/desboth.pl
rename to jni/libopenssl/crypto/des/asm/desboth.pl
diff --git a/jni/openssl/crypto/des/asm/readme b/jni/libopenssl/crypto/des/asm/readme
similarity index 100%
rename from jni/openssl/crypto/des/asm/readme
rename to jni/libopenssl/crypto/des/asm/readme
diff --git a/jni/openssl/crypto/des/cbc3_enc.c b/jni/libopenssl/crypto/des/cbc3_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/cbc3_enc.c
rename to jni/libopenssl/crypto/des/cbc3_enc.c
diff --git a/jni/openssl/crypto/des/cbc_cksm.c b/jni/libopenssl/crypto/des/cbc_cksm.c
similarity index 100%
rename from jni/openssl/crypto/des/cbc_cksm.c
rename to jni/libopenssl/crypto/des/cbc_cksm.c
diff --git a/jni/openssl/crypto/des/cbc_enc.c b/jni/libopenssl/crypto/des/cbc_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/cbc_enc.c
rename to jni/libopenssl/crypto/des/cbc_enc.c
diff --git a/jni/openssl/crypto/des/cfb64ede.c b/jni/libopenssl/crypto/des/cfb64ede.c
similarity index 100%
rename from jni/openssl/crypto/des/cfb64ede.c
rename to jni/libopenssl/crypto/des/cfb64ede.c
diff --git a/jni/openssl/crypto/des/cfb64enc.c b/jni/libopenssl/crypto/des/cfb64enc.c
similarity index 100%
rename from jni/openssl/crypto/des/cfb64enc.c
rename to jni/libopenssl/crypto/des/cfb64enc.c
diff --git a/jni/openssl/crypto/des/cfb_enc.c b/jni/libopenssl/crypto/des/cfb_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/cfb_enc.c
rename to jni/libopenssl/crypto/des/cfb_enc.c
diff --git a/jni/openssl/crypto/des/des.c b/jni/libopenssl/crypto/des/des.c
similarity index 100%
rename from jni/openssl/crypto/des/des.c
rename to jni/libopenssl/crypto/des/des.c
diff --git a/jni/openssl/crypto/des/des.h b/jni/libopenssl/crypto/des/des.h
similarity index 100%
rename from jni/openssl/crypto/des/des.h
rename to jni/libopenssl/crypto/des/des.h
diff --git a/jni/openssl/crypto/des/des.pod b/jni/libopenssl/crypto/des/des.pod
similarity index 100%
rename from jni/openssl/crypto/des/des.pod
rename to jni/libopenssl/crypto/des/des.pod
diff --git a/jni/openssl/crypto/des/des3s.cpp b/jni/libopenssl/crypto/des/des3s.cpp
similarity index 100%
rename from jni/openssl/crypto/des/des3s.cpp
rename to jni/libopenssl/crypto/des/des3s.cpp
diff --git a/jni/openssl/crypto/des/des_enc.c b/jni/libopenssl/crypto/des/des_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/des_enc.c
rename to jni/libopenssl/crypto/des/des_enc.c
diff --git a/jni/openssl/crypto/des/des_locl.h b/jni/libopenssl/crypto/des/des_locl.h
similarity index 100%
rename from jni/openssl/crypto/des/des_locl.h
rename to jni/libopenssl/crypto/des/des_locl.h
diff --git a/jni/openssl/crypto/des/des_old.c b/jni/libopenssl/crypto/des/des_old.c
similarity index 100%
rename from jni/openssl/crypto/des/des_old.c
rename to jni/libopenssl/crypto/des/des_old.c
diff --git a/jni/openssl/crypto/des/des_old.h b/jni/libopenssl/crypto/des/des_old.h
similarity index 100%
rename from jni/openssl/crypto/des/des_old.h
rename to jni/libopenssl/crypto/des/des_old.h
diff --git a/jni/openssl/crypto/des/des_old2.c b/jni/libopenssl/crypto/des/des_old2.c
similarity index 100%
rename from jni/openssl/crypto/des/des_old2.c
rename to jni/libopenssl/crypto/des/des_old2.c
diff --git a/jni/openssl/crypto/des/des_opts.c b/jni/libopenssl/crypto/des/des_opts.c
similarity index 100%
rename from jni/openssl/crypto/des/des_opts.c
rename to jni/libopenssl/crypto/des/des_opts.c
diff --git a/jni/openssl/crypto/des/des_ver.h b/jni/libopenssl/crypto/des/des_ver.h
similarity index 100%
rename from jni/openssl/crypto/des/des_ver.h
rename to jni/libopenssl/crypto/des/des_ver.h
diff --git a/jni/openssl/crypto/des/dess.cpp b/jni/libopenssl/crypto/des/dess.cpp
similarity index 100%
rename from jni/openssl/crypto/des/dess.cpp
rename to jni/libopenssl/crypto/des/dess.cpp
diff --git a/jni/openssl/crypto/des/destest.c b/jni/libopenssl/crypto/des/destest.c
similarity index 100%
rename from jni/openssl/crypto/des/destest.c
rename to jni/libopenssl/crypto/des/destest.c
diff --git a/jni/openssl/crypto/des/ecb3_enc.c b/jni/libopenssl/crypto/des/ecb3_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/ecb3_enc.c
rename to jni/libopenssl/crypto/des/ecb3_enc.c
diff --git a/jni/openssl/crypto/des/ecb_enc.c b/jni/libopenssl/crypto/des/ecb_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/ecb_enc.c
rename to jni/libopenssl/crypto/des/ecb_enc.c
diff --git a/jni/openssl/crypto/des/ede_cbcm_enc.c b/jni/libopenssl/crypto/des/ede_cbcm_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/ede_cbcm_enc.c
rename to jni/libopenssl/crypto/des/ede_cbcm_enc.c
diff --git a/jni/openssl/crypto/des/enc_read.c b/jni/libopenssl/crypto/des/enc_read.c
similarity index 100%
rename from jni/openssl/crypto/des/enc_read.c
rename to jni/libopenssl/crypto/des/enc_read.c
diff --git a/jni/openssl/crypto/des/enc_writ.c b/jni/libopenssl/crypto/des/enc_writ.c
similarity index 100%
rename from jni/openssl/crypto/des/enc_writ.c
rename to jni/libopenssl/crypto/des/enc_writ.c
diff --git a/jni/openssl/crypto/des/fcrypt.c b/jni/libopenssl/crypto/des/fcrypt.c
similarity index 100%
rename from jni/openssl/crypto/des/fcrypt.c
rename to jni/libopenssl/crypto/des/fcrypt.c
diff --git a/jni/openssl/crypto/des/fcrypt_b.c b/jni/libopenssl/crypto/des/fcrypt_b.c
similarity index 100%
rename from jni/openssl/crypto/des/fcrypt_b.c
rename to jni/libopenssl/crypto/des/fcrypt_b.c
diff --git a/jni/openssl/crypto/des/makefile.bc b/jni/libopenssl/crypto/des/makefile.bc
similarity index 100%
rename from jni/openssl/crypto/des/makefile.bc
rename to jni/libopenssl/crypto/des/makefile.bc
diff --git a/jni/openssl/crypto/des/ncbc_enc.c b/jni/libopenssl/crypto/des/ncbc_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/ncbc_enc.c
rename to jni/libopenssl/crypto/des/ncbc_enc.c
diff --git a/jni/openssl/crypto/des/ofb64ede.c b/jni/libopenssl/crypto/des/ofb64ede.c
similarity index 100%
rename from jni/openssl/crypto/des/ofb64ede.c
rename to jni/libopenssl/crypto/des/ofb64ede.c
diff --git a/jni/openssl/crypto/des/ofb64enc.c b/jni/libopenssl/crypto/des/ofb64enc.c
similarity index 100%
rename from jni/openssl/crypto/des/ofb64enc.c
rename to jni/libopenssl/crypto/des/ofb64enc.c
diff --git a/jni/openssl/crypto/des/ofb_enc.c b/jni/libopenssl/crypto/des/ofb_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/ofb_enc.c
rename to jni/libopenssl/crypto/des/ofb_enc.c
diff --git a/jni/openssl/crypto/des/options.txt b/jni/libopenssl/crypto/des/options.txt
similarity index 100%
rename from jni/openssl/crypto/des/options.txt
rename to jni/libopenssl/crypto/des/options.txt
diff --git a/jni/openssl/crypto/des/pcbc_enc.c b/jni/libopenssl/crypto/des/pcbc_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/pcbc_enc.c
rename to jni/libopenssl/crypto/des/pcbc_enc.c
diff --git a/jni/openssl/crypto/des/qud_cksm.c b/jni/libopenssl/crypto/des/qud_cksm.c
similarity index 100%
rename from jni/openssl/crypto/des/qud_cksm.c
rename to jni/libopenssl/crypto/des/qud_cksm.c
diff --git a/jni/openssl/crypto/des/rand_key.c b/jni/libopenssl/crypto/des/rand_key.c
similarity index 100%
rename from jni/openssl/crypto/des/rand_key.c
rename to jni/libopenssl/crypto/des/rand_key.c
diff --git a/jni/openssl/crypto/des/read2pwd.c b/jni/libopenssl/crypto/des/read2pwd.c
similarity index 100%
rename from jni/openssl/crypto/des/read2pwd.c
rename to jni/libopenssl/crypto/des/read2pwd.c
diff --git a/jni/openssl/crypto/des/read_pwd.c b/jni/libopenssl/crypto/des/read_pwd.c
similarity index 100%
rename from jni/openssl/crypto/des/read_pwd.c
rename to jni/libopenssl/crypto/des/read_pwd.c
diff --git a/jni/openssl/crypto/des/rpc_des.h b/jni/libopenssl/crypto/des/rpc_des.h
similarity index 100%
rename from jni/openssl/crypto/des/rpc_des.h
rename to jni/libopenssl/crypto/des/rpc_des.h
diff --git a/jni/openssl/crypto/des/rpc_enc.c b/jni/libopenssl/crypto/des/rpc_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/rpc_enc.c
rename to jni/libopenssl/crypto/des/rpc_enc.c
diff --git a/jni/openssl/crypto/des/rpw.c b/jni/libopenssl/crypto/des/rpw.c
similarity index 100%
rename from jni/openssl/crypto/des/rpw.c
rename to jni/libopenssl/crypto/des/rpw.c
diff --git a/jni/openssl/crypto/des/set_key.c b/jni/libopenssl/crypto/des/set_key.c
similarity index 100%
rename from jni/openssl/crypto/des/set_key.c
rename to jni/libopenssl/crypto/des/set_key.c
diff --git a/jni/openssl/crypto/des/speed.c b/jni/libopenssl/crypto/des/speed.c
similarity index 100%
rename from jni/openssl/crypto/des/speed.c
rename to jni/libopenssl/crypto/des/speed.c
diff --git a/jni/openssl/crypto/des/spr.h b/jni/libopenssl/crypto/des/spr.h
similarity index 100%
rename from jni/openssl/crypto/des/spr.h
rename to jni/libopenssl/crypto/des/spr.h
diff --git a/jni/openssl/crypto/des/str2key.c b/jni/libopenssl/crypto/des/str2key.c
similarity index 100%
rename from jni/openssl/crypto/des/str2key.c
rename to jni/libopenssl/crypto/des/str2key.c
diff --git a/jni/openssl/crypto/des/t/test b/jni/libopenssl/crypto/des/t/test
similarity index 100%
rename from jni/openssl/crypto/des/t/test
rename to jni/libopenssl/crypto/des/t/test
diff --git a/jni/openssl/crypto/des/times/486-50.sol b/jni/libopenssl/crypto/des/times/486-50.sol
similarity index 100%
rename from jni/openssl/crypto/des/times/486-50.sol
rename to jni/libopenssl/crypto/des/times/486-50.sol
diff --git a/jni/openssl/crypto/des/times/586-100.lnx b/jni/libopenssl/crypto/des/times/586-100.lnx
similarity index 100%
rename from jni/openssl/crypto/des/times/586-100.lnx
rename to jni/libopenssl/crypto/des/times/586-100.lnx
diff --git a/jni/openssl/crypto/des/times/686-200.fre b/jni/libopenssl/crypto/des/times/686-200.fre
similarity index 100%
rename from jni/openssl/crypto/des/times/686-200.fre
rename to jni/libopenssl/crypto/des/times/686-200.fre
diff --git a/jni/openssl/crypto/des/times/aix.cc b/jni/libopenssl/crypto/des/times/aix.cc
similarity index 100%
rename from jni/openssl/crypto/des/times/aix.cc
rename to jni/libopenssl/crypto/des/times/aix.cc
diff --git a/jni/openssl/crypto/des/times/alpha.cc b/jni/libopenssl/crypto/des/times/alpha.cc
similarity index 100%
rename from jni/openssl/crypto/des/times/alpha.cc
rename to jni/libopenssl/crypto/des/times/alpha.cc
diff --git a/jni/openssl/crypto/des/times/hpux.cc b/jni/libopenssl/crypto/des/times/hpux.cc
similarity index 100%
rename from jni/openssl/crypto/des/times/hpux.cc
rename to jni/libopenssl/crypto/des/times/hpux.cc
diff --git a/jni/openssl/crypto/des/times/sparc.gcc b/jni/libopenssl/crypto/des/times/sparc.gcc
similarity index 100%
rename from jni/openssl/crypto/des/times/sparc.gcc
rename to jni/libopenssl/crypto/des/times/sparc.gcc
diff --git a/jni/openssl/crypto/des/times/usparc.cc b/jni/libopenssl/crypto/des/times/usparc.cc
similarity index 100%
rename from jni/openssl/crypto/des/times/usparc.cc
rename to jni/libopenssl/crypto/des/times/usparc.cc
diff --git a/jni/openssl/crypto/des/typemap b/jni/libopenssl/crypto/des/typemap
similarity index 100%
rename from jni/openssl/crypto/des/typemap
rename to jni/libopenssl/crypto/des/typemap
diff --git a/jni/openssl/crypto/des/xcbc_enc.c b/jni/libopenssl/crypto/des/xcbc_enc.c
similarity index 100%
rename from jni/openssl/crypto/des/xcbc_enc.c
rename to jni/libopenssl/crypto/des/xcbc_enc.c
diff --git a/jni/openssl/crypto/dh/dh.h b/jni/libopenssl/crypto/dh/dh.h
similarity index 100%
rename from jni/openssl/crypto/dh/dh.h
rename to jni/libopenssl/crypto/dh/dh.h
diff --git a/jni/openssl/crypto/dh/dh1024.pem b/jni/libopenssl/crypto/dh/dh1024.pem
similarity index 100%
rename from jni/openssl/crypto/dh/dh1024.pem
rename to jni/libopenssl/crypto/dh/dh1024.pem
diff --git a/jni/openssl/crypto/dh/dh192.pem b/jni/libopenssl/crypto/dh/dh192.pem
similarity index 100%
rename from jni/openssl/crypto/dh/dh192.pem
rename to jni/libopenssl/crypto/dh/dh192.pem
diff --git a/jni/openssl/crypto/dh/dh2048.pem b/jni/libopenssl/crypto/dh/dh2048.pem
similarity index 100%
rename from jni/openssl/crypto/dh/dh2048.pem
rename to jni/libopenssl/crypto/dh/dh2048.pem
diff --git a/jni/openssl/crypto/dh/dh4096.pem b/jni/libopenssl/crypto/dh/dh4096.pem
similarity index 100%
rename from jni/openssl/crypto/dh/dh4096.pem
rename to jni/libopenssl/crypto/dh/dh4096.pem
diff --git a/jni/openssl/crypto/dh/dh512.pem b/jni/libopenssl/crypto/dh/dh512.pem
similarity index 100%
rename from jni/openssl/crypto/dh/dh512.pem
rename to jni/libopenssl/crypto/dh/dh512.pem
diff --git a/jni/openssl/crypto/dh/dh_ameth.c b/jni/libopenssl/crypto/dh/dh_ameth.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_ameth.c
rename to jni/libopenssl/crypto/dh/dh_ameth.c
diff --git a/jni/openssl/crypto/dh/dh_asn1.c b/jni/libopenssl/crypto/dh/dh_asn1.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_asn1.c
rename to jni/libopenssl/crypto/dh/dh_asn1.c
diff --git a/jni/openssl/crypto/dh/dh_check.c b/jni/libopenssl/crypto/dh/dh_check.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_check.c
rename to jni/libopenssl/crypto/dh/dh_check.c
diff --git a/jni/openssl/crypto/dh/dh_depr.c b/jni/libopenssl/crypto/dh/dh_depr.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_depr.c
rename to jni/libopenssl/crypto/dh/dh_depr.c
diff --git a/jni/openssl/crypto/dh/dh_err.c b/jni/libopenssl/crypto/dh/dh_err.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_err.c
rename to jni/libopenssl/crypto/dh/dh_err.c
diff --git a/jni/openssl/crypto/dh/dh_gen.c b/jni/libopenssl/crypto/dh/dh_gen.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_gen.c
rename to jni/libopenssl/crypto/dh/dh_gen.c
diff --git a/jni/openssl/crypto/dh/dh_key.c b/jni/libopenssl/crypto/dh/dh_key.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_key.c
rename to jni/libopenssl/crypto/dh/dh_key.c
diff --git a/jni/openssl/crypto/dh/dh_lib.c b/jni/libopenssl/crypto/dh/dh_lib.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_lib.c
rename to jni/libopenssl/crypto/dh/dh_lib.c
diff --git a/jni/openssl/crypto/dh/dh_pmeth.c b/jni/libopenssl/crypto/dh/dh_pmeth.c
similarity index 100%
rename from jni/openssl/crypto/dh/dh_pmeth.c
rename to jni/libopenssl/crypto/dh/dh_pmeth.c
diff --git a/jni/openssl/crypto/dh/dhtest.c b/jni/libopenssl/crypto/dh/dhtest.c
similarity index 100%
rename from jni/openssl/crypto/dh/dhtest.c
rename to jni/libopenssl/crypto/dh/dhtest.c
diff --git a/jni/openssl/crypto/dh/example b/jni/libopenssl/crypto/dh/example
similarity index 100%
rename from jni/openssl/crypto/dh/example
rename to jni/libopenssl/crypto/dh/example
diff --git a/jni/openssl/crypto/dh/generate b/jni/libopenssl/crypto/dh/generate
similarity index 100%
rename from jni/openssl/crypto/dh/generate
rename to jni/libopenssl/crypto/dh/generate
diff --git a/jni/openssl/crypto/dh/p1024.c b/jni/libopenssl/crypto/dh/p1024.c
similarity index 100%
rename from jni/openssl/crypto/dh/p1024.c
rename to jni/libopenssl/crypto/dh/p1024.c
diff --git a/jni/openssl/crypto/dh/p192.c b/jni/libopenssl/crypto/dh/p192.c
similarity index 100%
rename from jni/openssl/crypto/dh/p192.c
rename to jni/libopenssl/crypto/dh/p192.c
diff --git a/jni/openssl/crypto/dh/p512.c b/jni/libopenssl/crypto/dh/p512.c
similarity index 100%
rename from jni/openssl/crypto/dh/p512.c
rename to jni/libopenssl/crypto/dh/p512.c
diff --git a/jni/openssl/crypto/dsa/README b/jni/libopenssl/crypto/dsa/README
similarity index 100%
rename from jni/openssl/crypto/dsa/README
rename to jni/libopenssl/crypto/dsa/README
diff --git a/jni/openssl/crypto/dsa/dsa.h b/jni/libopenssl/crypto/dsa/dsa.h
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa.h
rename to jni/libopenssl/crypto/dsa/dsa.h
diff --git a/jni/openssl/crypto/dsa/dsa_ameth.c b/jni/libopenssl/crypto/dsa/dsa_ameth.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_ameth.c
rename to jni/libopenssl/crypto/dsa/dsa_ameth.c
diff --git a/jni/openssl/crypto/dsa/dsa_asn1.c b/jni/libopenssl/crypto/dsa/dsa_asn1.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_asn1.c
rename to jni/libopenssl/crypto/dsa/dsa_asn1.c
diff --git a/jni/openssl/crypto/dsa/dsa_depr.c b/jni/libopenssl/crypto/dsa/dsa_depr.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_depr.c
rename to jni/libopenssl/crypto/dsa/dsa_depr.c
diff --git a/jni/openssl/crypto/dsa/dsa_err.c b/jni/libopenssl/crypto/dsa/dsa_err.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_err.c
rename to jni/libopenssl/crypto/dsa/dsa_err.c
diff --git a/jni/openssl/crypto/dsa/dsa_gen.c b/jni/libopenssl/crypto/dsa/dsa_gen.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_gen.c
rename to jni/libopenssl/crypto/dsa/dsa_gen.c
diff --git a/jni/openssl/crypto/dsa/dsa_key.c b/jni/libopenssl/crypto/dsa/dsa_key.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_key.c
rename to jni/libopenssl/crypto/dsa/dsa_key.c
diff --git a/jni/openssl/crypto/dsa/dsa_lib.c b/jni/libopenssl/crypto/dsa/dsa_lib.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_lib.c
rename to jni/libopenssl/crypto/dsa/dsa_lib.c
diff --git a/jni/openssl/crypto/dsa/dsa_locl.h b/jni/libopenssl/crypto/dsa/dsa_locl.h
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_locl.h
rename to jni/libopenssl/crypto/dsa/dsa_locl.h
diff --git a/jni/openssl/crypto/dsa/dsa_ossl.c b/jni/libopenssl/crypto/dsa/dsa_ossl.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_ossl.c
rename to jni/libopenssl/crypto/dsa/dsa_ossl.c
diff --git a/jni/openssl/crypto/dsa/dsa_pmeth.c b/jni/libopenssl/crypto/dsa/dsa_pmeth.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_pmeth.c
rename to jni/libopenssl/crypto/dsa/dsa_pmeth.c
diff --git a/jni/openssl/crypto/dsa/dsa_prn.c b/jni/libopenssl/crypto/dsa/dsa_prn.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_prn.c
rename to jni/libopenssl/crypto/dsa/dsa_prn.c
diff --git a/jni/openssl/crypto/dsa/dsa_sign.c b/jni/libopenssl/crypto/dsa/dsa_sign.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_sign.c
rename to jni/libopenssl/crypto/dsa/dsa_sign.c
diff --git a/jni/openssl/crypto/dsa/dsa_vrf.c b/jni/libopenssl/crypto/dsa/dsa_vrf.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsa_vrf.c
rename to jni/libopenssl/crypto/dsa/dsa_vrf.c
diff --git a/jni/openssl/crypto/dsa/dsagen.c b/jni/libopenssl/crypto/dsa/dsagen.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsagen.c
rename to jni/libopenssl/crypto/dsa/dsagen.c
diff --git a/jni/openssl/crypto/dsa/dsatest.c b/jni/libopenssl/crypto/dsa/dsatest.c
similarity index 100%
rename from jni/openssl/crypto/dsa/dsatest.c
rename to jni/libopenssl/crypto/dsa/dsatest.c
diff --git a/jni/openssl/crypto/dsa/fips186a.txt b/jni/libopenssl/crypto/dsa/fips186a.txt
similarity index 100%
rename from jni/openssl/crypto/dsa/fips186a.txt
rename to jni/libopenssl/crypto/dsa/fips186a.txt
diff --git a/jni/openssl/crypto/dso/README b/jni/libopenssl/crypto/dso/README
similarity index 100%
rename from jni/openssl/crypto/dso/README
rename to jni/libopenssl/crypto/dso/README
diff --git a/jni/openssl/crypto/dso/dso.h b/jni/libopenssl/crypto/dso/dso.h
similarity index 100%
rename from jni/openssl/crypto/dso/dso.h
rename to jni/libopenssl/crypto/dso/dso.h
diff --git a/jni/openssl/crypto/dso/dso_dl.c b/jni/libopenssl/crypto/dso/dso_dl.c
similarity index 100%
rename from jni/openssl/crypto/dso/dso_dl.c
rename to jni/libopenssl/crypto/dso/dso_dl.c
diff --git a/jni/openssl/crypto/dso/dso_dlfcn.c b/jni/libopenssl/crypto/dso/dso_dlfcn.c
similarity index 100%
rename from jni/openssl/crypto/dso/dso_dlfcn.c
rename to jni/libopenssl/crypto/dso/dso_dlfcn.c
diff --git a/jni/openssl/crypto/dso/dso_err.c b/jni/libopenssl/crypto/dso/dso_err.c
similarity index 100%
rename from jni/openssl/crypto/dso/dso_err.c
rename to jni/libopenssl/crypto/dso/dso_err.c
diff --git a/jni/openssl/crypto/dso/dso_lib.c b/jni/libopenssl/crypto/dso/dso_lib.c
similarity index 100%
rename from jni/openssl/crypto/dso/dso_lib.c
rename to jni/libopenssl/crypto/dso/dso_lib.c
diff --git a/jni/openssl/crypto/dso/dso_null.c b/jni/libopenssl/crypto/dso/dso_null.c
similarity index 100%
rename from jni/openssl/crypto/dso/dso_null.c
rename to jni/libopenssl/crypto/dso/dso_null.c
diff --git a/jni/openssl/crypto/dso/dso_openssl.c b/jni/libopenssl/crypto/dso/dso_openssl.c
similarity index 100%
rename from jni/openssl/crypto/dso/dso_openssl.c
rename to jni/libopenssl/crypto/dso/dso_openssl.c
diff --git a/jni/openssl/crypto/ebcdic.c b/jni/libopenssl/crypto/ebcdic.c
similarity index 100%
rename from jni/openssl/crypto/ebcdic.c
rename to jni/libopenssl/crypto/ebcdic.c
diff --git a/jni/openssl/crypto/ebcdic.h b/jni/libopenssl/crypto/ebcdic.h
similarity index 100%
rename from jni/openssl/crypto/ebcdic.h
rename to jni/libopenssl/crypto/ebcdic.h
diff --git a/jni/openssl/crypto/ec/ec.h b/jni/libopenssl/crypto/ec/ec.h
similarity index 100%
rename from jni/openssl/crypto/ec/ec.h
rename to jni/libopenssl/crypto/ec/ec.h
diff --git a/jni/openssl/crypto/ec/ec2_mult.c b/jni/libopenssl/crypto/ec/ec2_mult.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec2_mult.c
rename to jni/libopenssl/crypto/ec/ec2_mult.c
diff --git a/jni/openssl/crypto/ec/ec2_smpl.c b/jni/libopenssl/crypto/ec/ec2_smpl.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec2_smpl.c
rename to jni/libopenssl/crypto/ec/ec2_smpl.c
diff --git a/jni/openssl/crypto/ec/ec_ameth.c b/jni/libopenssl/crypto/ec/ec_ameth.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_ameth.c
rename to jni/libopenssl/crypto/ec/ec_ameth.c
diff --git a/jni/openssl/crypto/ec/ec_asn1.c b/jni/libopenssl/crypto/ec/ec_asn1.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_asn1.c
rename to jni/libopenssl/crypto/ec/ec_asn1.c
diff --git a/jni/openssl/crypto/ec/ec_check.c b/jni/libopenssl/crypto/ec/ec_check.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_check.c
rename to jni/libopenssl/crypto/ec/ec_check.c
diff --git a/jni/openssl/crypto/ec/ec_curve.c b/jni/libopenssl/crypto/ec/ec_curve.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_curve.c
rename to jni/libopenssl/crypto/ec/ec_curve.c
diff --git a/jni/openssl/crypto/ec/ec_cvt.c b/jni/libopenssl/crypto/ec/ec_cvt.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_cvt.c
rename to jni/libopenssl/crypto/ec/ec_cvt.c
diff --git a/jni/openssl/crypto/ec/ec_err.c b/jni/libopenssl/crypto/ec/ec_err.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_err.c
rename to jni/libopenssl/crypto/ec/ec_err.c
diff --git a/jni/openssl/crypto/ec/ec_key.c b/jni/libopenssl/crypto/ec/ec_key.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_key.c
rename to jni/libopenssl/crypto/ec/ec_key.c
diff --git a/jni/openssl/crypto/ec/ec_lcl.h b/jni/libopenssl/crypto/ec/ec_lcl.h
similarity index 100%
rename from jni/openssl/crypto/ec/ec_lcl.h
rename to jni/libopenssl/crypto/ec/ec_lcl.h
diff --git a/jni/openssl/crypto/ec/ec_lib.c b/jni/libopenssl/crypto/ec/ec_lib.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_lib.c
rename to jni/libopenssl/crypto/ec/ec_lib.c
diff --git a/jni/openssl/crypto/ec/ec_mult.c b/jni/libopenssl/crypto/ec/ec_mult.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_mult.c
rename to jni/libopenssl/crypto/ec/ec_mult.c
diff --git a/jni/openssl/crypto/ec/ec_pmeth.c b/jni/libopenssl/crypto/ec/ec_pmeth.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_pmeth.c
rename to jni/libopenssl/crypto/ec/ec_pmeth.c
diff --git a/jni/openssl/crypto/ec/ec_print.c b/jni/libopenssl/crypto/ec/ec_print.c
similarity index 100%
rename from jni/openssl/crypto/ec/ec_print.c
rename to jni/libopenssl/crypto/ec/ec_print.c
diff --git a/jni/openssl/crypto/ec/eck_prn.c b/jni/libopenssl/crypto/ec/eck_prn.c
similarity index 100%
rename from jni/openssl/crypto/ec/eck_prn.c
rename to jni/libopenssl/crypto/ec/eck_prn.c
diff --git a/jni/openssl/crypto/ec/ecp_mont.c b/jni/libopenssl/crypto/ec/ecp_mont.c
similarity index 100%
rename from jni/openssl/crypto/ec/ecp_mont.c
rename to jni/libopenssl/crypto/ec/ecp_mont.c
diff --git a/jni/openssl/crypto/ec/ecp_nist.c b/jni/libopenssl/crypto/ec/ecp_nist.c
similarity index 100%
rename from jni/openssl/crypto/ec/ecp_nist.c
rename to jni/libopenssl/crypto/ec/ecp_nist.c
diff --git a/jni/openssl/crypto/ec/ecp_smpl.c b/jni/libopenssl/crypto/ec/ecp_smpl.c
similarity index 100%
rename from jni/openssl/crypto/ec/ecp_smpl.c
rename to jni/libopenssl/crypto/ec/ecp_smpl.c
diff --git a/jni/openssl/crypto/ec/ectest.c b/jni/libopenssl/crypto/ec/ectest.c
similarity index 100%
rename from jni/openssl/crypto/ec/ectest.c
rename to jni/libopenssl/crypto/ec/ectest.c
diff --git a/jni/openssl/crypto/ecdh/ecdh.h b/jni/libopenssl/crypto/ecdh/ecdh.h
similarity index 100%
rename from jni/openssl/crypto/ecdh/ecdh.h
rename to jni/libopenssl/crypto/ecdh/ecdh.h
diff --git a/jni/openssl/crypto/ecdh/ecdhtest.c b/jni/libopenssl/crypto/ecdh/ecdhtest.c
similarity index 100%
rename from jni/openssl/crypto/ecdh/ecdhtest.c
rename to jni/libopenssl/crypto/ecdh/ecdhtest.c
diff --git a/jni/openssl/crypto/ecdh/ech_err.c b/jni/libopenssl/crypto/ecdh/ech_err.c
similarity index 100%
rename from jni/openssl/crypto/ecdh/ech_err.c
rename to jni/libopenssl/crypto/ecdh/ech_err.c
diff --git a/jni/openssl/crypto/ecdh/ech_key.c b/jni/libopenssl/crypto/ecdh/ech_key.c
similarity index 100%
rename from jni/openssl/crypto/ecdh/ech_key.c
rename to jni/libopenssl/crypto/ecdh/ech_key.c
diff --git a/jni/openssl/crypto/ecdh/ech_lib.c b/jni/libopenssl/crypto/ecdh/ech_lib.c
similarity index 100%
rename from jni/openssl/crypto/ecdh/ech_lib.c
rename to jni/libopenssl/crypto/ecdh/ech_lib.c
diff --git a/jni/openssl/crypto/ecdh/ech_locl.h b/jni/libopenssl/crypto/ecdh/ech_locl.h
similarity index 100%
rename from jni/openssl/crypto/ecdh/ech_locl.h
rename to jni/libopenssl/crypto/ecdh/ech_locl.h
diff --git a/jni/openssl/crypto/ecdh/ech_ossl.c b/jni/libopenssl/crypto/ecdh/ech_ossl.c
similarity index 100%
rename from jni/openssl/crypto/ecdh/ech_ossl.c
rename to jni/libopenssl/crypto/ecdh/ech_ossl.c
diff --git a/jni/openssl/crypto/ecdsa/ecdsa.h b/jni/libopenssl/crypto/ecdsa/ecdsa.h
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecdsa.h
rename to jni/libopenssl/crypto/ecdsa/ecdsa.h
diff --git a/jni/openssl/crypto/ecdsa/ecdsatest.c b/jni/libopenssl/crypto/ecdsa/ecdsatest.c
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecdsatest.c
rename to jni/libopenssl/crypto/ecdsa/ecdsatest.c
diff --git a/jni/openssl/crypto/ecdsa/ecs_asn1.c b/jni/libopenssl/crypto/ecdsa/ecs_asn1.c
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecs_asn1.c
rename to jni/libopenssl/crypto/ecdsa/ecs_asn1.c
diff --git a/jni/openssl/crypto/ecdsa/ecs_err.c b/jni/libopenssl/crypto/ecdsa/ecs_err.c
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecs_err.c
rename to jni/libopenssl/crypto/ecdsa/ecs_err.c
diff --git a/jni/openssl/crypto/ecdsa/ecs_lib.c b/jni/libopenssl/crypto/ecdsa/ecs_lib.c
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecs_lib.c
rename to jni/libopenssl/crypto/ecdsa/ecs_lib.c
diff --git a/jni/openssl/crypto/ecdsa/ecs_locl.h b/jni/libopenssl/crypto/ecdsa/ecs_locl.h
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecs_locl.h
rename to jni/libopenssl/crypto/ecdsa/ecs_locl.h
diff --git a/jni/openssl/crypto/ecdsa/ecs_ossl.c b/jni/libopenssl/crypto/ecdsa/ecs_ossl.c
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecs_ossl.c
rename to jni/libopenssl/crypto/ecdsa/ecs_ossl.c
diff --git a/jni/openssl/crypto/ecdsa/ecs_sign.c b/jni/libopenssl/crypto/ecdsa/ecs_sign.c
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecs_sign.c
rename to jni/libopenssl/crypto/ecdsa/ecs_sign.c
diff --git a/jni/openssl/crypto/ecdsa/ecs_vrf.c b/jni/libopenssl/crypto/ecdsa/ecs_vrf.c
similarity index 100%
rename from jni/openssl/crypto/ecdsa/ecs_vrf.c
rename to jni/libopenssl/crypto/ecdsa/ecs_vrf.c
diff --git a/jni/openssl/crypto/engine/README b/jni/libopenssl/crypto/engine/README
similarity index 100%
rename from jni/openssl/crypto/engine/README
rename to jni/libopenssl/crypto/engine/README
diff --git a/jni/openssl/crypto/engine/eng_all.c b/jni/libopenssl/crypto/engine/eng_all.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_all.c
rename to jni/libopenssl/crypto/engine/eng_all.c
diff --git a/jni/openssl/crypto/engine/eng_cnf.c b/jni/libopenssl/crypto/engine/eng_cnf.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_cnf.c
rename to jni/libopenssl/crypto/engine/eng_cnf.c
diff --git a/jni/openssl/crypto/engine/eng_cryptodev.c b/jni/libopenssl/crypto/engine/eng_cryptodev.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_cryptodev.c
rename to jni/libopenssl/crypto/engine/eng_cryptodev.c
diff --git a/jni/openssl/crypto/engine/eng_ctrl.c b/jni/libopenssl/crypto/engine/eng_ctrl.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_ctrl.c
rename to jni/libopenssl/crypto/engine/eng_ctrl.c
diff --git a/jni/openssl/crypto/engine/eng_dyn.c b/jni/libopenssl/crypto/engine/eng_dyn.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_dyn.c
rename to jni/libopenssl/crypto/engine/eng_dyn.c
diff --git a/jni/openssl/crypto/engine/eng_err.c b/jni/libopenssl/crypto/engine/eng_err.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_err.c
rename to jni/libopenssl/crypto/engine/eng_err.c
diff --git a/jni/openssl/crypto/engine/eng_fat.c b/jni/libopenssl/crypto/engine/eng_fat.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_fat.c
rename to jni/libopenssl/crypto/engine/eng_fat.c
diff --git a/jni/openssl/crypto/engine/eng_init.c b/jni/libopenssl/crypto/engine/eng_init.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_init.c
rename to jni/libopenssl/crypto/engine/eng_init.c
diff --git a/jni/openssl/crypto/engine/eng_int.h b/jni/libopenssl/crypto/engine/eng_int.h
similarity index 100%
rename from jni/openssl/crypto/engine/eng_int.h
rename to jni/libopenssl/crypto/engine/eng_int.h
diff --git a/jni/openssl/crypto/engine/eng_lib.c b/jni/libopenssl/crypto/engine/eng_lib.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_lib.c
rename to jni/libopenssl/crypto/engine/eng_lib.c
diff --git a/jni/openssl/crypto/engine/eng_list.c b/jni/libopenssl/crypto/engine/eng_list.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_list.c
rename to jni/libopenssl/crypto/engine/eng_list.c
diff --git a/jni/openssl/crypto/engine/eng_openssl.c b/jni/libopenssl/crypto/engine/eng_openssl.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_openssl.c
rename to jni/libopenssl/crypto/engine/eng_openssl.c
diff --git a/jni/openssl/crypto/engine/eng_pkey.c b/jni/libopenssl/crypto/engine/eng_pkey.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_pkey.c
rename to jni/libopenssl/crypto/engine/eng_pkey.c
diff --git a/jni/openssl/crypto/engine/eng_table.c b/jni/libopenssl/crypto/engine/eng_table.c
similarity index 100%
rename from jni/openssl/crypto/engine/eng_table.c
rename to jni/libopenssl/crypto/engine/eng_table.c
diff --git a/jni/openssl/crypto/engine/engine.h b/jni/libopenssl/crypto/engine/engine.h
similarity index 100%
rename from jni/openssl/crypto/engine/engine.h
rename to jni/libopenssl/crypto/engine/engine.h
diff --git a/jni/openssl/crypto/engine/enginetest.c b/jni/libopenssl/crypto/engine/enginetest.c
similarity index 100%
rename from jni/openssl/crypto/engine/enginetest.c
rename to jni/libopenssl/crypto/engine/enginetest.c
diff --git a/jni/openssl/crypto/engine/tb_cipher.c b/jni/libopenssl/crypto/engine/tb_cipher.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_cipher.c
rename to jni/libopenssl/crypto/engine/tb_cipher.c
diff --git a/jni/openssl/crypto/engine/tb_dh.c b/jni/libopenssl/crypto/engine/tb_dh.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_dh.c
rename to jni/libopenssl/crypto/engine/tb_dh.c
diff --git a/jni/openssl/crypto/engine/tb_digest.c b/jni/libopenssl/crypto/engine/tb_digest.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_digest.c
rename to jni/libopenssl/crypto/engine/tb_digest.c
diff --git a/jni/openssl/crypto/engine/tb_dsa.c b/jni/libopenssl/crypto/engine/tb_dsa.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_dsa.c
rename to jni/libopenssl/crypto/engine/tb_dsa.c
diff --git a/jni/openssl/crypto/engine/tb_ecdh.c b/jni/libopenssl/crypto/engine/tb_ecdh.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_ecdh.c
rename to jni/libopenssl/crypto/engine/tb_ecdh.c
diff --git a/jni/openssl/crypto/engine/tb_ecdsa.c b/jni/libopenssl/crypto/engine/tb_ecdsa.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_ecdsa.c
rename to jni/libopenssl/crypto/engine/tb_ecdsa.c
diff --git a/jni/openssl/crypto/engine/tb_rand.c b/jni/libopenssl/crypto/engine/tb_rand.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_rand.c
rename to jni/libopenssl/crypto/engine/tb_rand.c
diff --git a/jni/openssl/crypto/engine/tb_rsa.c b/jni/libopenssl/crypto/engine/tb_rsa.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_rsa.c
rename to jni/libopenssl/crypto/engine/tb_rsa.c
diff --git a/jni/openssl/crypto/engine/tb_store.c b/jni/libopenssl/crypto/engine/tb_store.c
similarity index 100%
rename from jni/openssl/crypto/engine/tb_store.c
rename to jni/libopenssl/crypto/engine/tb_store.c
diff --git a/jni/openssl/crypto/err/err.c b/jni/libopenssl/crypto/err/err.c
similarity index 100%
rename from jni/openssl/crypto/err/err.c
rename to jni/libopenssl/crypto/err/err.c
diff --git a/jni/openssl/crypto/err/err.h b/jni/libopenssl/crypto/err/err.h
similarity index 100%
rename from jni/openssl/crypto/err/err.h
rename to jni/libopenssl/crypto/err/err.h
diff --git a/jni/openssl/crypto/err/err_all.c b/jni/libopenssl/crypto/err/err_all.c
similarity index 100%
rename from jni/openssl/crypto/err/err_all.c
rename to jni/libopenssl/crypto/err/err_all.c
diff --git a/jni/openssl/crypto/err/err_prn.c b/jni/libopenssl/crypto/err/err_prn.c
similarity index 100%
rename from jni/openssl/crypto/err/err_prn.c
rename to jni/libopenssl/crypto/err/err_prn.c
diff --git a/jni/openssl/crypto/err/openssl.ec b/jni/libopenssl/crypto/err/openssl.ec
similarity index 100%
rename from jni/openssl/crypto/err/openssl.ec
rename to jni/libopenssl/crypto/err/openssl.ec
diff --git a/jni/openssl/crypto/evp/bio_b64.c b/jni/libopenssl/crypto/evp/bio_b64.c
similarity index 100%
rename from jni/openssl/crypto/evp/bio_b64.c
rename to jni/libopenssl/crypto/evp/bio_b64.c
diff --git a/jni/openssl/crypto/evp/bio_enc.c b/jni/libopenssl/crypto/evp/bio_enc.c
similarity index 100%
rename from jni/openssl/crypto/evp/bio_enc.c
rename to jni/libopenssl/crypto/evp/bio_enc.c
diff --git a/jni/openssl/crypto/evp/bio_md.c b/jni/libopenssl/crypto/evp/bio_md.c
similarity index 100%
rename from jni/openssl/crypto/evp/bio_md.c
rename to jni/libopenssl/crypto/evp/bio_md.c
diff --git a/jni/openssl/crypto/evp/bio_ok.c b/jni/libopenssl/crypto/evp/bio_ok.c
similarity index 100%
rename from jni/openssl/crypto/evp/bio_ok.c
rename to jni/libopenssl/crypto/evp/bio_ok.c
diff --git a/jni/openssl/crypto/evp/c_all.c b/jni/libopenssl/crypto/evp/c_all.c
similarity index 100%
rename from jni/openssl/crypto/evp/c_all.c
rename to jni/libopenssl/crypto/evp/c_all.c
diff --git a/jni/openssl/crypto/evp/c_allc.c b/jni/libopenssl/crypto/evp/c_allc.c
similarity index 100%
rename from jni/openssl/crypto/evp/c_allc.c
rename to jni/libopenssl/crypto/evp/c_allc.c
diff --git a/jni/openssl/crypto/evp/c_alld.c b/jni/libopenssl/crypto/evp/c_alld.c
similarity index 100%
rename from jni/openssl/crypto/evp/c_alld.c
rename to jni/libopenssl/crypto/evp/c_alld.c
diff --git a/jni/openssl/crypto/evp/digest.c b/jni/libopenssl/crypto/evp/digest.c
similarity index 100%
rename from jni/openssl/crypto/evp/digest.c
rename to jni/libopenssl/crypto/evp/digest.c
diff --git a/jni/openssl/crypto/evp/e_aes.c b/jni/libopenssl/crypto/evp/e_aes.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_aes.c
rename to jni/libopenssl/crypto/evp/e_aes.c
diff --git a/jni/openssl/crypto/evp/e_bf.c b/jni/libopenssl/crypto/evp/e_bf.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_bf.c
rename to jni/libopenssl/crypto/evp/e_bf.c
diff --git a/jni/openssl/crypto/evp/e_camellia.c b/jni/libopenssl/crypto/evp/e_camellia.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_camellia.c
rename to jni/libopenssl/crypto/evp/e_camellia.c
diff --git a/jni/openssl/crypto/evp/e_cast.c b/jni/libopenssl/crypto/evp/e_cast.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_cast.c
rename to jni/libopenssl/crypto/evp/e_cast.c
diff --git a/jni/openssl/crypto/evp/e_des.c b/jni/libopenssl/crypto/evp/e_des.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_des.c
rename to jni/libopenssl/crypto/evp/e_des.c
diff --git a/jni/openssl/crypto/evp/e_des3.c b/jni/libopenssl/crypto/evp/e_des3.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_des3.c
rename to jni/libopenssl/crypto/evp/e_des3.c
diff --git a/jni/openssl/crypto/evp/e_dsa.c b/jni/libopenssl/crypto/evp/e_dsa.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_dsa.c
rename to jni/libopenssl/crypto/evp/e_dsa.c
diff --git a/jni/openssl/crypto/evp/e_idea.c b/jni/libopenssl/crypto/evp/e_idea.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_idea.c
rename to jni/libopenssl/crypto/evp/e_idea.c
diff --git a/jni/openssl/crypto/evp/e_null.c b/jni/libopenssl/crypto/evp/e_null.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_null.c
rename to jni/libopenssl/crypto/evp/e_null.c
diff --git a/jni/openssl/crypto/evp/e_old.c b/jni/libopenssl/crypto/evp/e_old.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_old.c
rename to jni/libopenssl/crypto/evp/e_old.c
diff --git a/jni/openssl/crypto/evp/e_rc2.c b/jni/libopenssl/crypto/evp/e_rc2.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_rc2.c
rename to jni/libopenssl/crypto/evp/e_rc2.c
diff --git a/jni/openssl/crypto/evp/e_rc4.c b/jni/libopenssl/crypto/evp/e_rc4.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_rc4.c
rename to jni/libopenssl/crypto/evp/e_rc4.c
diff --git a/jni/openssl/crypto/evp/e_rc5.c b/jni/libopenssl/crypto/evp/e_rc5.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_rc5.c
rename to jni/libopenssl/crypto/evp/e_rc5.c
diff --git a/jni/openssl/crypto/evp/e_seed.c b/jni/libopenssl/crypto/evp/e_seed.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_seed.c
rename to jni/libopenssl/crypto/evp/e_seed.c
diff --git a/jni/openssl/crypto/evp/e_xcbc_d.c b/jni/libopenssl/crypto/evp/e_xcbc_d.c
similarity index 100%
rename from jni/openssl/crypto/evp/e_xcbc_d.c
rename to jni/libopenssl/crypto/evp/e_xcbc_d.c
diff --git a/jni/openssl/crypto/evp/encode.c b/jni/libopenssl/crypto/evp/encode.c
similarity index 100%
rename from jni/openssl/crypto/evp/encode.c
rename to jni/libopenssl/crypto/evp/encode.c
diff --git a/jni/openssl/crypto/evp/evp.h b/jni/libopenssl/crypto/evp/evp.h
similarity index 100%
rename from jni/openssl/crypto/evp/evp.h
rename to jni/libopenssl/crypto/evp/evp.h
diff --git a/jni/openssl/crypto/evp/evp_acnf.c b/jni/libopenssl/crypto/evp/evp_acnf.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_acnf.c
rename to jni/libopenssl/crypto/evp/evp_acnf.c
diff --git a/jni/openssl/crypto/evp/evp_enc.c b/jni/libopenssl/crypto/evp/evp_enc.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_enc.c
rename to jni/libopenssl/crypto/evp/evp_enc.c
diff --git a/jni/openssl/crypto/evp/evp_err.c b/jni/libopenssl/crypto/evp/evp_err.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_err.c
rename to jni/libopenssl/crypto/evp/evp_err.c
diff --git a/jni/openssl/crypto/evp/evp_key.c b/jni/libopenssl/crypto/evp/evp_key.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_key.c
rename to jni/libopenssl/crypto/evp/evp_key.c
diff --git a/jni/openssl/crypto/evp/evp_lib.c b/jni/libopenssl/crypto/evp/evp_lib.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_lib.c
rename to jni/libopenssl/crypto/evp/evp_lib.c
diff --git a/jni/openssl/crypto/evp/evp_locl.h b/jni/libopenssl/crypto/evp/evp_locl.h
similarity index 100%
rename from jni/openssl/crypto/evp/evp_locl.h
rename to jni/libopenssl/crypto/evp/evp_locl.h
diff --git a/jni/openssl/crypto/evp/evp_pbe.c b/jni/libopenssl/crypto/evp/evp_pbe.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_pbe.c
rename to jni/libopenssl/crypto/evp/evp_pbe.c
diff --git a/jni/openssl/crypto/evp/evp_pkey.c b/jni/libopenssl/crypto/evp/evp_pkey.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_pkey.c
rename to jni/libopenssl/crypto/evp/evp_pkey.c
diff --git a/jni/openssl/crypto/evp/evp_test.c b/jni/libopenssl/crypto/evp/evp_test.c
similarity index 100%
rename from jni/openssl/crypto/evp/evp_test.c
rename to jni/libopenssl/crypto/evp/evp_test.c
diff --git a/jni/openssl/crypto/evp/evptests.txt b/jni/libopenssl/crypto/evp/evptests.txt
similarity index 100%
rename from jni/openssl/crypto/evp/evptests.txt
rename to jni/libopenssl/crypto/evp/evptests.txt
diff --git a/jni/openssl/crypto/evp/m_dss.c b/jni/libopenssl/crypto/evp/m_dss.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_dss.c
rename to jni/libopenssl/crypto/evp/m_dss.c
diff --git a/jni/openssl/crypto/evp/m_dss1.c b/jni/libopenssl/crypto/evp/m_dss1.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_dss1.c
rename to jni/libopenssl/crypto/evp/m_dss1.c
diff --git a/jni/openssl/crypto/evp/m_ecdsa.c b/jni/libopenssl/crypto/evp/m_ecdsa.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_ecdsa.c
rename to jni/libopenssl/crypto/evp/m_ecdsa.c
diff --git a/jni/openssl/crypto/evp/m_md4.c b/jni/libopenssl/crypto/evp/m_md4.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_md4.c
rename to jni/libopenssl/crypto/evp/m_md4.c
diff --git a/jni/openssl/crypto/evp/m_md5.c b/jni/libopenssl/crypto/evp/m_md5.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_md5.c
rename to jni/libopenssl/crypto/evp/m_md5.c
diff --git a/jni/openssl/crypto/evp/m_mdc2.c b/jni/libopenssl/crypto/evp/m_mdc2.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_mdc2.c
rename to jni/libopenssl/crypto/evp/m_mdc2.c
diff --git a/jni/openssl/crypto/evp/m_null.c b/jni/libopenssl/crypto/evp/m_null.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_null.c
rename to jni/libopenssl/crypto/evp/m_null.c
diff --git a/jni/openssl/crypto/evp/m_ripemd.c b/jni/libopenssl/crypto/evp/m_ripemd.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_ripemd.c
rename to jni/libopenssl/crypto/evp/m_ripemd.c
diff --git a/jni/openssl/crypto/evp/m_sha1.c b/jni/libopenssl/crypto/evp/m_sha1.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_sha1.c
rename to jni/libopenssl/crypto/evp/m_sha1.c
diff --git a/jni/openssl/crypto/evp/m_sigver.c b/jni/libopenssl/crypto/evp/m_sigver.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_sigver.c
rename to jni/libopenssl/crypto/evp/m_sigver.c
diff --git a/jni/openssl/crypto/evp/m_wp.c b/jni/libopenssl/crypto/evp/m_wp.c
similarity index 100%
rename from jni/openssl/crypto/evp/m_wp.c
rename to jni/libopenssl/crypto/evp/m_wp.c
diff --git a/jni/openssl/crypto/evp/names.c b/jni/libopenssl/crypto/evp/names.c
similarity index 100%
rename from jni/openssl/crypto/evp/names.c
rename to jni/libopenssl/crypto/evp/names.c
diff --git a/jni/openssl/crypto/evp/openbsd_hw.c b/jni/libopenssl/crypto/evp/openbsd_hw.c
similarity index 100%
rename from jni/openssl/crypto/evp/openbsd_hw.c
rename to jni/libopenssl/crypto/evp/openbsd_hw.c
diff --git a/jni/openssl/crypto/evp/p5_crpt.c b/jni/libopenssl/crypto/evp/p5_crpt.c
similarity index 100%
rename from jni/openssl/crypto/evp/p5_crpt.c
rename to jni/libopenssl/crypto/evp/p5_crpt.c
diff --git a/jni/openssl/crypto/evp/p5_crpt2.c b/jni/libopenssl/crypto/evp/p5_crpt2.c
similarity index 100%
rename from jni/openssl/crypto/evp/p5_crpt2.c
rename to jni/libopenssl/crypto/evp/p5_crpt2.c
diff --git a/jni/openssl/crypto/evp/p_dec.c b/jni/libopenssl/crypto/evp/p_dec.c
similarity index 100%
rename from jni/openssl/crypto/evp/p_dec.c
rename to jni/libopenssl/crypto/evp/p_dec.c
diff --git a/jni/openssl/crypto/evp/p_enc.c b/jni/libopenssl/crypto/evp/p_enc.c
similarity index 100%
rename from jni/openssl/crypto/evp/p_enc.c
rename to jni/libopenssl/crypto/evp/p_enc.c
diff --git a/jni/openssl/crypto/evp/p_lib.c b/jni/libopenssl/crypto/evp/p_lib.c
similarity index 100%
rename from jni/openssl/crypto/evp/p_lib.c
rename to jni/libopenssl/crypto/evp/p_lib.c
diff --git a/jni/openssl/crypto/evp/p_open.c b/jni/libopenssl/crypto/evp/p_open.c
similarity index 100%
rename from jni/openssl/crypto/evp/p_open.c
rename to jni/libopenssl/crypto/evp/p_open.c
diff --git a/jni/openssl/crypto/evp/p_seal.c b/jni/libopenssl/crypto/evp/p_seal.c
similarity index 100%
rename from jni/openssl/crypto/evp/p_seal.c
rename to jni/libopenssl/crypto/evp/p_seal.c
diff --git a/jni/openssl/crypto/evp/p_sign.c b/jni/libopenssl/crypto/evp/p_sign.c
similarity index 100%
rename from jni/openssl/crypto/evp/p_sign.c
rename to jni/libopenssl/crypto/evp/p_sign.c
diff --git a/jni/openssl/crypto/evp/p_verify.c b/jni/libopenssl/crypto/evp/p_verify.c
similarity index 100%
rename from jni/openssl/crypto/evp/p_verify.c
rename to jni/libopenssl/crypto/evp/p_verify.c
diff --git a/jni/openssl/crypto/evp/pmeth_fn.c b/jni/libopenssl/crypto/evp/pmeth_fn.c
similarity index 100%
rename from jni/openssl/crypto/evp/pmeth_fn.c
rename to jni/libopenssl/crypto/evp/pmeth_fn.c
diff --git a/jni/openssl/crypto/evp/pmeth_gn.c b/jni/libopenssl/crypto/evp/pmeth_gn.c
similarity index 100%
rename from jni/openssl/crypto/evp/pmeth_gn.c
rename to jni/libopenssl/crypto/evp/pmeth_gn.c
diff --git a/jni/openssl/crypto/evp/pmeth_lib.c b/jni/libopenssl/crypto/evp/pmeth_lib.c
similarity index 100%
rename from jni/openssl/crypto/evp/pmeth_lib.c
rename to jni/libopenssl/crypto/evp/pmeth_lib.c
diff --git a/jni/openssl/crypto/ex_data.c b/jni/libopenssl/crypto/ex_data.c
similarity index 100%
rename from jni/openssl/crypto/ex_data.c
rename to jni/libopenssl/crypto/ex_data.c
diff --git a/jni/openssl/crypto/hmac/hm_ameth.c b/jni/libopenssl/crypto/hmac/hm_ameth.c
similarity index 100%
rename from jni/openssl/crypto/hmac/hm_ameth.c
rename to jni/libopenssl/crypto/hmac/hm_ameth.c
diff --git a/jni/openssl/crypto/hmac/hm_pmeth.c b/jni/libopenssl/crypto/hmac/hm_pmeth.c
similarity index 100%
rename from jni/openssl/crypto/hmac/hm_pmeth.c
rename to jni/libopenssl/crypto/hmac/hm_pmeth.c
diff --git a/jni/openssl/crypto/hmac/hmac.c b/jni/libopenssl/crypto/hmac/hmac.c
similarity index 100%
rename from jni/openssl/crypto/hmac/hmac.c
rename to jni/libopenssl/crypto/hmac/hmac.c
diff --git a/jni/openssl/crypto/hmac/hmac.h b/jni/libopenssl/crypto/hmac/hmac.h
similarity index 100%
rename from jni/openssl/crypto/hmac/hmac.h
rename to jni/libopenssl/crypto/hmac/hmac.h
diff --git a/jni/openssl/crypto/hmac/hmactest.c b/jni/libopenssl/crypto/hmac/hmactest.c
similarity index 100%
rename from jni/openssl/crypto/hmac/hmactest.c
rename to jni/libopenssl/crypto/hmac/hmactest.c
diff --git a/jni/openssl/crypto/ia64cpuid.S b/jni/libopenssl/crypto/ia64cpuid.S
similarity index 100%
rename from jni/openssl/crypto/ia64cpuid.S
rename to jni/libopenssl/crypto/ia64cpuid.S
diff --git a/jni/openssl/crypto/jpake/jpake.c b/jni/libopenssl/crypto/jpake/jpake.c
similarity index 100%
rename from jni/openssl/crypto/jpake/jpake.c
rename to jni/libopenssl/crypto/jpake/jpake.c
diff --git a/jni/openssl/crypto/jpake/jpake.h b/jni/libopenssl/crypto/jpake/jpake.h
similarity index 100%
rename from jni/openssl/crypto/jpake/jpake.h
rename to jni/libopenssl/crypto/jpake/jpake.h
diff --git a/jni/openssl/crypto/jpake/jpake_err.c b/jni/libopenssl/crypto/jpake/jpake_err.c
similarity index 100%
rename from jni/openssl/crypto/jpake/jpake_err.c
rename to jni/libopenssl/crypto/jpake/jpake_err.c
diff --git a/jni/openssl/crypto/jpake/jpaketest.c b/jni/libopenssl/crypto/jpake/jpaketest.c
similarity index 100%
rename from jni/openssl/crypto/jpake/jpaketest.c
rename to jni/libopenssl/crypto/jpake/jpaketest.c
diff --git a/jni/openssl/crypto/krb5/krb5_asn.c b/jni/libopenssl/crypto/krb5/krb5_asn.c
similarity index 100%
rename from jni/openssl/crypto/krb5/krb5_asn.c
rename to jni/libopenssl/crypto/krb5/krb5_asn.c
diff --git a/jni/openssl/crypto/krb5/krb5_asn.h b/jni/libopenssl/crypto/krb5/krb5_asn.h
similarity index 100%
rename from jni/openssl/crypto/krb5/krb5_asn.h
rename to jni/libopenssl/crypto/krb5/krb5_asn.h
diff --git a/jni/openssl/crypto/lhash/lh_stats.c b/jni/libopenssl/crypto/lhash/lh_stats.c
similarity index 100%
rename from jni/openssl/crypto/lhash/lh_stats.c
rename to jni/libopenssl/crypto/lhash/lh_stats.c
diff --git a/jni/openssl/crypto/lhash/lh_test.c b/jni/libopenssl/crypto/lhash/lh_test.c
similarity index 100%
rename from jni/openssl/crypto/lhash/lh_test.c
rename to jni/libopenssl/crypto/lhash/lh_test.c
diff --git a/jni/openssl/crypto/lhash/lhash.c b/jni/libopenssl/crypto/lhash/lhash.c
similarity index 100%
rename from jni/openssl/crypto/lhash/lhash.c
rename to jni/libopenssl/crypto/lhash/lhash.c
diff --git a/jni/openssl/crypto/lhash/lhash.h b/jni/libopenssl/crypto/lhash/lhash.h
similarity index 100%
rename from jni/openssl/crypto/lhash/lhash.h
rename to jni/libopenssl/crypto/lhash/lhash.h
diff --git a/jni/openssl/crypto/lhash/num.pl b/jni/libopenssl/crypto/lhash/num.pl
similarity index 100%
rename from jni/openssl/crypto/lhash/num.pl
rename to jni/libopenssl/crypto/lhash/num.pl
diff --git a/jni/openssl/crypto/md32_common.h b/jni/libopenssl/crypto/md32_common.h
similarity index 100%
rename from jni/openssl/crypto/md32_common.h
rename to jni/libopenssl/crypto/md32_common.h
diff --git a/jni/openssl/crypto/md4/md4.c b/jni/libopenssl/crypto/md4/md4.c
similarity index 100%
rename from jni/openssl/crypto/md4/md4.c
rename to jni/libopenssl/crypto/md4/md4.c
diff --git a/jni/openssl/crypto/md4/md4.h b/jni/libopenssl/crypto/md4/md4.h
similarity index 100%
rename from jni/openssl/crypto/md4/md4.h
rename to jni/libopenssl/crypto/md4/md4.h
diff --git a/jni/openssl/crypto/md4/md4_dgst.c b/jni/libopenssl/crypto/md4/md4_dgst.c
similarity index 100%
rename from jni/openssl/crypto/md4/md4_dgst.c
rename to jni/libopenssl/crypto/md4/md4_dgst.c
diff --git a/jni/openssl/crypto/md4/md4_locl.h b/jni/libopenssl/crypto/md4/md4_locl.h
similarity index 100%
rename from jni/openssl/crypto/md4/md4_locl.h
rename to jni/libopenssl/crypto/md4/md4_locl.h
diff --git a/jni/openssl/crypto/md4/md4_one.c b/jni/libopenssl/crypto/md4/md4_one.c
similarity index 100%
rename from jni/openssl/crypto/md4/md4_one.c
rename to jni/libopenssl/crypto/md4/md4_one.c
diff --git a/jni/openssl/crypto/md4/md4s.cpp b/jni/libopenssl/crypto/md4/md4s.cpp
similarity index 100%
rename from jni/openssl/crypto/md4/md4s.cpp
rename to jni/libopenssl/crypto/md4/md4s.cpp
diff --git a/jni/openssl/crypto/md4/md4test.c b/jni/libopenssl/crypto/md4/md4test.c
similarity index 100%
rename from jni/openssl/crypto/md4/md4test.c
rename to jni/libopenssl/crypto/md4/md4test.c
diff --git a/jni/openssl/crypto/md5/asm/md5-586.pl b/jni/libopenssl/crypto/md5/asm/md5-586.pl
similarity index 100%
rename from jni/openssl/crypto/md5/asm/md5-586.pl
rename to jni/libopenssl/crypto/md5/asm/md5-586.pl
diff --git a/jni/openssl/crypto/md5/asm/md5-ia64.S b/jni/libopenssl/crypto/md5/asm/md5-ia64.S
similarity index 100%
rename from jni/openssl/crypto/md5/asm/md5-ia64.S
rename to jni/libopenssl/crypto/md5/asm/md5-ia64.S
diff --git a/jni/openssl/crypto/md5/asm/md5-x86_64.pl b/jni/libopenssl/crypto/md5/asm/md5-x86_64.pl
similarity index 100%
rename from jni/openssl/crypto/md5/asm/md5-x86_64.pl
rename to jni/libopenssl/crypto/md5/asm/md5-x86_64.pl
diff --git a/jni/openssl/crypto/md5/md5.c b/jni/libopenssl/crypto/md5/md5.c
similarity index 100%
rename from jni/openssl/crypto/md5/md5.c
rename to jni/libopenssl/crypto/md5/md5.c
diff --git a/jni/openssl/crypto/md5/md5.h b/jni/libopenssl/crypto/md5/md5.h
similarity index 100%
rename from jni/openssl/crypto/md5/md5.h
rename to jni/libopenssl/crypto/md5/md5.h
diff --git a/jni/openssl/crypto/md5/md5_dgst.c b/jni/libopenssl/crypto/md5/md5_dgst.c
similarity index 100%
rename from jni/openssl/crypto/md5/md5_dgst.c
rename to jni/libopenssl/crypto/md5/md5_dgst.c
diff --git a/jni/openssl/crypto/md5/md5_locl.h b/jni/libopenssl/crypto/md5/md5_locl.h
similarity index 100%
rename from jni/openssl/crypto/md5/md5_locl.h
rename to jni/libopenssl/crypto/md5/md5_locl.h
diff --git a/jni/openssl/crypto/md5/md5_one.c b/jni/libopenssl/crypto/md5/md5_one.c
similarity index 100%
rename from jni/openssl/crypto/md5/md5_one.c
rename to jni/libopenssl/crypto/md5/md5_one.c
diff --git a/jni/openssl/crypto/md5/md5s.cpp b/jni/libopenssl/crypto/md5/md5s.cpp
similarity index 100%
rename from jni/openssl/crypto/md5/md5s.cpp
rename to jni/libopenssl/crypto/md5/md5s.cpp
diff --git a/jni/openssl/crypto/md5/md5test.c b/jni/libopenssl/crypto/md5/md5test.c
similarity index 100%
rename from jni/openssl/crypto/md5/md5test.c
rename to jni/libopenssl/crypto/md5/md5test.c
diff --git a/jni/openssl/crypto/mdc2/mdc2.h b/jni/libopenssl/crypto/mdc2/mdc2.h
similarity index 100%
rename from jni/openssl/crypto/mdc2/mdc2.h
rename to jni/libopenssl/crypto/mdc2/mdc2.h
diff --git a/jni/openssl/crypto/mdc2/mdc2_one.c b/jni/libopenssl/crypto/mdc2/mdc2_one.c
similarity index 100%
rename from jni/openssl/crypto/mdc2/mdc2_one.c
rename to jni/libopenssl/crypto/mdc2/mdc2_one.c
diff --git a/jni/openssl/crypto/mdc2/mdc2dgst.c b/jni/libopenssl/crypto/mdc2/mdc2dgst.c
similarity index 100%
rename from jni/openssl/crypto/mdc2/mdc2dgst.c
rename to jni/libopenssl/crypto/mdc2/mdc2dgst.c
diff --git a/jni/openssl/crypto/mdc2/mdc2test.c b/jni/libopenssl/crypto/mdc2/mdc2test.c
similarity index 100%
rename from jni/openssl/crypto/mdc2/mdc2test.c
rename to jni/libopenssl/crypto/mdc2/mdc2test.c
diff --git a/jni/openssl/crypto/mem.c b/jni/libopenssl/crypto/mem.c
similarity index 100%
rename from jni/openssl/crypto/mem.c
rename to jni/libopenssl/crypto/mem.c
diff --git a/jni/openssl/crypto/mem_clr.c b/jni/libopenssl/crypto/mem_clr.c
similarity index 100%
rename from jni/openssl/crypto/mem_clr.c
rename to jni/libopenssl/crypto/mem_clr.c
diff --git a/jni/openssl/crypto/mem_dbg.c b/jni/libopenssl/crypto/mem_dbg.c
similarity index 100%
rename from jni/openssl/crypto/mem_dbg.c
rename to jni/libopenssl/crypto/mem_dbg.c
diff --git a/jni/openssl/crypto/modes/cbc128.c b/jni/libopenssl/crypto/modes/cbc128.c
similarity index 100%
rename from jni/openssl/crypto/modes/cbc128.c
rename to jni/libopenssl/crypto/modes/cbc128.c
diff --git a/jni/openssl/crypto/modes/cfb128.c b/jni/libopenssl/crypto/modes/cfb128.c
similarity index 100%
rename from jni/openssl/crypto/modes/cfb128.c
rename to jni/libopenssl/crypto/modes/cfb128.c
diff --git a/jni/openssl/crypto/modes/ctr128.c b/jni/libopenssl/crypto/modes/ctr128.c
similarity index 100%
rename from jni/openssl/crypto/modes/ctr128.c
rename to jni/libopenssl/crypto/modes/ctr128.c
diff --git a/jni/openssl/crypto/modes/ofb128.c b/jni/libopenssl/crypto/modes/ofb128.c
similarity index 100%
rename from jni/openssl/crypto/modes/ofb128.c
rename to jni/libopenssl/crypto/modes/ofb128.c
diff --git a/jni/openssl/crypto/o_dir.c b/jni/libopenssl/crypto/o_dir.c
similarity index 100%
rename from jni/openssl/crypto/o_dir.c
rename to jni/libopenssl/crypto/o_dir.c
diff --git a/jni/openssl/crypto/o_dir.h b/jni/libopenssl/crypto/o_dir.h
similarity index 100%
rename from jni/openssl/crypto/o_dir.h
rename to jni/libopenssl/crypto/o_dir.h
diff --git a/jni/openssl/crypto/o_dir_test.c b/jni/libopenssl/crypto/o_dir_test.c
similarity index 100%
rename from jni/openssl/crypto/o_dir_test.c
rename to jni/libopenssl/crypto/o_dir_test.c
diff --git a/jni/openssl/crypto/o_str.c b/jni/libopenssl/crypto/o_str.c
similarity index 100%
rename from jni/openssl/crypto/o_str.c
rename to jni/libopenssl/crypto/o_str.c
diff --git a/jni/openssl/crypto/o_str.h b/jni/libopenssl/crypto/o_str.h
similarity index 100%
rename from jni/openssl/crypto/o_str.h
rename to jni/libopenssl/crypto/o_str.h
diff --git a/jni/openssl/crypto/o_time.c b/jni/libopenssl/crypto/o_time.c
similarity index 100%
rename from jni/openssl/crypto/o_time.c
rename to jni/libopenssl/crypto/o_time.c
diff --git a/jni/openssl/crypto/o_time.h b/jni/libopenssl/crypto/o_time.h
similarity index 100%
rename from jni/openssl/crypto/o_time.h
rename to jni/libopenssl/crypto/o_time.h
diff --git a/jni/openssl/crypto/objects/o_names.c b/jni/libopenssl/crypto/objects/o_names.c
similarity index 100%
rename from jni/openssl/crypto/objects/o_names.c
rename to jni/libopenssl/crypto/objects/o_names.c
diff --git a/jni/openssl/crypto/objects/obj_dat.c b/jni/libopenssl/crypto/objects/obj_dat.c
similarity index 100%
rename from jni/openssl/crypto/objects/obj_dat.c
rename to jni/libopenssl/crypto/objects/obj_dat.c
diff --git a/jni/openssl/crypto/objects/obj_dat.h b/jni/libopenssl/crypto/objects/obj_dat.h
similarity index 100%
rename from jni/openssl/crypto/objects/obj_dat.h
rename to jni/libopenssl/crypto/objects/obj_dat.h
diff --git a/jni/openssl/crypto/objects/obj_dat.pl b/jni/libopenssl/crypto/objects/obj_dat.pl
similarity index 100%
rename from jni/openssl/crypto/objects/obj_dat.pl
rename to jni/libopenssl/crypto/objects/obj_dat.pl
diff --git a/jni/openssl/crypto/objects/obj_err.c b/jni/libopenssl/crypto/objects/obj_err.c
similarity index 100%
rename from jni/openssl/crypto/objects/obj_err.c
rename to jni/libopenssl/crypto/objects/obj_err.c
diff --git a/jni/openssl/crypto/objects/obj_lib.c b/jni/libopenssl/crypto/objects/obj_lib.c
similarity index 100%
rename from jni/openssl/crypto/objects/obj_lib.c
rename to jni/libopenssl/crypto/objects/obj_lib.c
diff --git a/jni/openssl/crypto/objects/obj_mac.h b/jni/libopenssl/crypto/objects/obj_mac.h
similarity index 100%
rename from jni/openssl/crypto/objects/obj_mac.h
rename to jni/libopenssl/crypto/objects/obj_mac.h
diff --git a/jni/openssl/crypto/objects/obj_mac.num b/jni/libopenssl/crypto/objects/obj_mac.num
similarity index 100%
rename from jni/openssl/crypto/objects/obj_mac.num
rename to jni/libopenssl/crypto/objects/obj_mac.num
diff --git a/jni/openssl/crypto/objects/obj_xref.c b/jni/libopenssl/crypto/objects/obj_xref.c
similarity index 100%
rename from jni/openssl/crypto/objects/obj_xref.c
rename to jni/libopenssl/crypto/objects/obj_xref.c
diff --git a/jni/openssl/crypto/objects/obj_xref.h b/jni/libopenssl/crypto/objects/obj_xref.h
similarity index 100%
rename from jni/openssl/crypto/objects/obj_xref.h
rename to jni/libopenssl/crypto/objects/obj_xref.h
diff --git a/jni/openssl/crypto/objects/obj_xref.txt b/jni/libopenssl/crypto/objects/obj_xref.txt
similarity index 100%
rename from jni/openssl/crypto/objects/obj_xref.txt
rename to jni/libopenssl/crypto/objects/obj_xref.txt
diff --git a/jni/openssl/crypto/objects/objects.README b/jni/libopenssl/crypto/objects/objects.README
similarity index 100%
rename from jni/openssl/crypto/objects/objects.README
rename to jni/libopenssl/crypto/objects/objects.README
diff --git a/jni/openssl/crypto/objects/objects.h b/jni/libopenssl/crypto/objects/objects.h
similarity index 100%
rename from jni/openssl/crypto/objects/objects.h
rename to jni/libopenssl/crypto/objects/objects.h
diff --git a/jni/openssl/crypto/objects/objects.pl b/jni/libopenssl/crypto/objects/objects.pl
similarity index 100%
rename from jni/openssl/crypto/objects/objects.pl
rename to jni/libopenssl/crypto/objects/objects.pl
diff --git a/jni/openssl/crypto/objects/objects.txt b/jni/libopenssl/crypto/objects/objects.txt
similarity index 100%
rename from jni/openssl/crypto/objects/objects.txt
rename to jni/libopenssl/crypto/objects/objects.txt
diff --git a/jni/openssl/crypto/objects/objxref.pl b/jni/libopenssl/crypto/objects/objxref.pl
similarity index 100%
rename from jni/openssl/crypto/objects/objxref.pl
rename to jni/libopenssl/crypto/objects/objxref.pl
diff --git a/jni/openssl/crypto/ocsp/ocsp.h b/jni/libopenssl/crypto/ocsp/ocsp.h
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp.h
rename to jni/libopenssl/crypto/ocsp/ocsp.h
diff --git a/jni/openssl/crypto/ocsp/ocsp_asn.c b/jni/libopenssl/crypto/ocsp/ocsp_asn.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_asn.c
rename to jni/libopenssl/crypto/ocsp/ocsp_asn.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_cl.c b/jni/libopenssl/crypto/ocsp/ocsp_cl.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_cl.c
rename to jni/libopenssl/crypto/ocsp/ocsp_cl.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_err.c b/jni/libopenssl/crypto/ocsp/ocsp_err.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_err.c
rename to jni/libopenssl/crypto/ocsp/ocsp_err.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_ext.c b/jni/libopenssl/crypto/ocsp/ocsp_ext.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_ext.c
rename to jni/libopenssl/crypto/ocsp/ocsp_ext.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_ht.c b/jni/libopenssl/crypto/ocsp/ocsp_ht.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_ht.c
rename to jni/libopenssl/crypto/ocsp/ocsp_ht.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_lib.c b/jni/libopenssl/crypto/ocsp/ocsp_lib.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_lib.c
rename to jni/libopenssl/crypto/ocsp/ocsp_lib.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_prn.c b/jni/libopenssl/crypto/ocsp/ocsp_prn.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_prn.c
rename to jni/libopenssl/crypto/ocsp/ocsp_prn.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_srv.c b/jni/libopenssl/crypto/ocsp/ocsp_srv.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_srv.c
rename to jni/libopenssl/crypto/ocsp/ocsp_srv.c
diff --git a/jni/openssl/crypto/ocsp/ocsp_vfy.c b/jni/libopenssl/crypto/ocsp/ocsp_vfy.c
similarity index 100%
rename from jni/openssl/crypto/ocsp/ocsp_vfy.c
rename to jni/libopenssl/crypto/ocsp/ocsp_vfy.c
diff --git a/jni/openssl/crypto/opensslconf.h b/jni/libopenssl/crypto/opensslconf.h
similarity index 100%
rename from jni/openssl/crypto/opensslconf.h
rename to jni/libopenssl/crypto/opensslconf.h
diff --git a/jni/openssl/crypto/opensslconf.h.in b/jni/libopenssl/crypto/opensslconf.h.in
similarity index 100%
rename from jni/openssl/crypto/opensslconf.h.in
rename to jni/libopenssl/crypto/opensslconf.h.in
diff --git a/jni/openssl/crypto/opensslv.h b/jni/libopenssl/crypto/opensslv.h
similarity index 100%
rename from jni/openssl/crypto/opensslv.h
rename to jni/libopenssl/crypto/opensslv.h
diff --git a/jni/openssl/crypto/ossl_typ.h b/jni/libopenssl/crypto/ossl_typ.h
similarity index 100%
rename from jni/openssl/crypto/ossl_typ.h
rename to jni/libopenssl/crypto/ossl_typ.h
diff --git a/jni/openssl/crypto/pem/message b/jni/libopenssl/crypto/pem/message
similarity index 100%
rename from jni/openssl/crypto/pem/message
rename to jni/libopenssl/crypto/pem/message
diff --git a/jni/openssl/crypto/pem/pem.h b/jni/libopenssl/crypto/pem/pem.h
similarity index 100%
rename from jni/openssl/crypto/pem/pem.h
rename to jni/libopenssl/crypto/pem/pem.h
diff --git a/jni/openssl/crypto/pem/pem2.h b/jni/libopenssl/crypto/pem/pem2.h
similarity index 100%
rename from jni/openssl/crypto/pem/pem2.h
rename to jni/libopenssl/crypto/pem/pem2.h
diff --git a/jni/openssl/crypto/pem/pem_all.c b/jni/libopenssl/crypto/pem/pem_all.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_all.c
rename to jni/libopenssl/crypto/pem/pem_all.c
diff --git a/jni/openssl/crypto/pem/pem_err.c b/jni/libopenssl/crypto/pem/pem_err.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_err.c
rename to jni/libopenssl/crypto/pem/pem_err.c
diff --git a/jni/openssl/crypto/pem/pem_info.c b/jni/libopenssl/crypto/pem/pem_info.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_info.c
rename to jni/libopenssl/crypto/pem/pem_info.c
diff --git a/jni/openssl/crypto/pem/pem_lib.c b/jni/libopenssl/crypto/pem/pem_lib.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_lib.c
rename to jni/libopenssl/crypto/pem/pem_lib.c
diff --git a/jni/openssl/crypto/pem/pem_oth.c b/jni/libopenssl/crypto/pem/pem_oth.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_oth.c
rename to jni/libopenssl/crypto/pem/pem_oth.c
diff --git a/jni/openssl/crypto/pem/pem_pk8.c b/jni/libopenssl/crypto/pem/pem_pk8.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_pk8.c
rename to jni/libopenssl/crypto/pem/pem_pk8.c
diff --git a/jni/openssl/crypto/pem/pem_pkey.c b/jni/libopenssl/crypto/pem/pem_pkey.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_pkey.c
rename to jni/libopenssl/crypto/pem/pem_pkey.c
diff --git a/jni/openssl/crypto/pem/pem_seal.c b/jni/libopenssl/crypto/pem/pem_seal.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_seal.c
rename to jni/libopenssl/crypto/pem/pem_seal.c
diff --git a/jni/openssl/crypto/pem/pem_sign.c b/jni/libopenssl/crypto/pem/pem_sign.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_sign.c
rename to jni/libopenssl/crypto/pem/pem_sign.c
diff --git a/jni/openssl/crypto/pem/pem_x509.c b/jni/libopenssl/crypto/pem/pem_x509.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_x509.c
rename to jni/libopenssl/crypto/pem/pem_x509.c
diff --git a/jni/openssl/crypto/pem/pem_xaux.c b/jni/libopenssl/crypto/pem/pem_xaux.c
similarity index 100%
rename from jni/openssl/crypto/pem/pem_xaux.c
rename to jni/libopenssl/crypto/pem/pem_xaux.c
diff --git a/jni/openssl/crypto/pem/pkcs7.lis b/jni/libopenssl/crypto/pem/pkcs7.lis
similarity index 100%
rename from jni/openssl/crypto/pem/pkcs7.lis
rename to jni/libopenssl/crypto/pem/pkcs7.lis
diff --git a/jni/openssl/crypto/pem/pvkfmt.c b/jni/libopenssl/crypto/pem/pvkfmt.c
similarity index 100%
rename from jni/openssl/crypto/pem/pvkfmt.c
rename to jni/libopenssl/crypto/pem/pvkfmt.c
diff --git a/jni/openssl/crypto/perlasm/cbc.pl b/jni/libopenssl/crypto/perlasm/cbc.pl
similarity index 100%
rename from jni/openssl/crypto/perlasm/cbc.pl
rename to jni/libopenssl/crypto/perlasm/cbc.pl
diff --git a/jni/openssl/crypto/perlasm/ppc-xlate.pl b/jni/libopenssl/crypto/perlasm/ppc-xlate.pl
similarity index 100%
rename from jni/openssl/crypto/perlasm/ppc-xlate.pl
rename to jni/libopenssl/crypto/perlasm/ppc-xlate.pl
diff --git a/jni/openssl/crypto/perlasm/readme b/jni/libopenssl/crypto/perlasm/readme
similarity index 100%
rename from jni/openssl/crypto/perlasm/readme
rename to jni/libopenssl/crypto/perlasm/readme
diff --git a/jni/openssl/crypto/perlasm/x86_64-xlate.pl b/jni/libopenssl/crypto/perlasm/x86_64-xlate.pl
similarity index 100%
rename from jni/openssl/crypto/perlasm/x86_64-xlate.pl
rename to jni/libopenssl/crypto/perlasm/x86_64-xlate.pl
diff --git a/jni/openssl/crypto/perlasm/x86asm.pl b/jni/libopenssl/crypto/perlasm/x86asm.pl
similarity index 100%
rename from jni/openssl/crypto/perlasm/x86asm.pl
rename to jni/libopenssl/crypto/perlasm/x86asm.pl
diff --git a/jni/openssl/crypto/perlasm/x86gas.pl b/jni/libopenssl/crypto/perlasm/x86gas.pl
similarity index 100%
rename from jni/openssl/crypto/perlasm/x86gas.pl
rename to jni/libopenssl/crypto/perlasm/x86gas.pl
diff --git a/jni/openssl/crypto/perlasm/x86masm.pl b/jni/libopenssl/crypto/perlasm/x86masm.pl
similarity index 100%
rename from jni/openssl/crypto/perlasm/x86masm.pl
rename to jni/libopenssl/crypto/perlasm/x86masm.pl
diff --git a/jni/openssl/crypto/perlasm/x86nasm.pl b/jni/libopenssl/crypto/perlasm/x86nasm.pl
similarity index 100%
rename from jni/openssl/crypto/perlasm/x86nasm.pl
rename to jni/libopenssl/crypto/perlasm/x86nasm.pl
diff --git a/jni/openssl/crypto/pkcs12/p12_add.c b/jni/libopenssl/crypto/pkcs12/p12_add.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_add.c
rename to jni/libopenssl/crypto/pkcs12/p12_add.c
diff --git a/jni/openssl/crypto/pkcs12/p12_asn.c b/jni/libopenssl/crypto/pkcs12/p12_asn.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_asn.c
rename to jni/libopenssl/crypto/pkcs12/p12_asn.c
diff --git a/jni/openssl/crypto/pkcs12/p12_attr.c b/jni/libopenssl/crypto/pkcs12/p12_attr.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_attr.c
rename to jni/libopenssl/crypto/pkcs12/p12_attr.c
diff --git a/jni/openssl/crypto/pkcs12/p12_crpt.c b/jni/libopenssl/crypto/pkcs12/p12_crpt.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_crpt.c
rename to jni/libopenssl/crypto/pkcs12/p12_crpt.c
diff --git a/jni/openssl/crypto/pkcs12/p12_crt.c b/jni/libopenssl/crypto/pkcs12/p12_crt.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_crt.c
rename to jni/libopenssl/crypto/pkcs12/p12_crt.c
diff --git a/jni/openssl/crypto/pkcs12/p12_decr.c b/jni/libopenssl/crypto/pkcs12/p12_decr.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_decr.c
rename to jni/libopenssl/crypto/pkcs12/p12_decr.c
diff --git a/jni/openssl/crypto/pkcs12/p12_init.c b/jni/libopenssl/crypto/pkcs12/p12_init.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_init.c
rename to jni/libopenssl/crypto/pkcs12/p12_init.c
diff --git a/jni/openssl/crypto/pkcs12/p12_key.c b/jni/libopenssl/crypto/pkcs12/p12_key.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_key.c
rename to jni/libopenssl/crypto/pkcs12/p12_key.c
diff --git a/jni/openssl/crypto/pkcs12/p12_kiss.c b/jni/libopenssl/crypto/pkcs12/p12_kiss.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_kiss.c
rename to jni/libopenssl/crypto/pkcs12/p12_kiss.c
diff --git a/jni/openssl/crypto/pkcs12/p12_mutl.c b/jni/libopenssl/crypto/pkcs12/p12_mutl.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_mutl.c
rename to jni/libopenssl/crypto/pkcs12/p12_mutl.c
diff --git a/jni/openssl/crypto/pkcs12/p12_npas.c b/jni/libopenssl/crypto/pkcs12/p12_npas.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_npas.c
rename to jni/libopenssl/crypto/pkcs12/p12_npas.c
diff --git a/jni/openssl/crypto/pkcs12/p12_p8d.c b/jni/libopenssl/crypto/pkcs12/p12_p8d.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_p8d.c
rename to jni/libopenssl/crypto/pkcs12/p12_p8d.c
diff --git a/jni/openssl/crypto/pkcs12/p12_p8e.c b/jni/libopenssl/crypto/pkcs12/p12_p8e.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_p8e.c
rename to jni/libopenssl/crypto/pkcs12/p12_p8e.c
diff --git a/jni/openssl/crypto/pkcs12/p12_utl.c b/jni/libopenssl/crypto/pkcs12/p12_utl.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/p12_utl.c
rename to jni/libopenssl/crypto/pkcs12/p12_utl.c
diff --git a/jni/openssl/crypto/pkcs12/pk12err.c b/jni/libopenssl/crypto/pkcs12/pk12err.c
similarity index 100%
rename from jni/openssl/crypto/pkcs12/pk12err.c
rename to jni/libopenssl/crypto/pkcs12/pk12err.c
diff --git a/jni/openssl/crypto/pkcs12/pkcs12.h b/jni/libopenssl/crypto/pkcs12/pkcs12.h
similarity index 100%
rename from jni/openssl/crypto/pkcs12/pkcs12.h
rename to jni/libopenssl/crypto/pkcs12/pkcs12.h
diff --git a/jni/openssl/crypto/pkcs7/bio_ber.c b/jni/libopenssl/crypto/pkcs7/bio_ber.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/bio_ber.c
rename to jni/libopenssl/crypto/pkcs7/bio_ber.c
diff --git a/jni/openssl/crypto/pkcs7/dec.c b/jni/libopenssl/crypto/pkcs7/dec.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/dec.c
rename to jni/libopenssl/crypto/pkcs7/dec.c
diff --git a/jni/openssl/crypto/pkcs7/des.pem b/jni/libopenssl/crypto/pkcs7/des.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/des.pem
rename to jni/libopenssl/crypto/pkcs7/des.pem
diff --git a/jni/openssl/crypto/pkcs7/doc b/jni/libopenssl/crypto/pkcs7/doc
similarity index 100%
rename from jni/openssl/crypto/pkcs7/doc
rename to jni/libopenssl/crypto/pkcs7/doc
diff --git a/jni/openssl/crypto/pkcs7/enc.c b/jni/libopenssl/crypto/pkcs7/enc.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/enc.c
rename to jni/libopenssl/crypto/pkcs7/enc.c
diff --git a/jni/openssl/crypto/pkcs7/es1.pem b/jni/libopenssl/crypto/pkcs7/es1.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/es1.pem
rename to jni/libopenssl/crypto/pkcs7/es1.pem
diff --git a/jni/openssl/crypto/pkcs7/example.c b/jni/libopenssl/crypto/pkcs7/example.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/example.c
rename to jni/libopenssl/crypto/pkcs7/example.c
diff --git a/jni/openssl/crypto/pkcs7/example.h b/jni/libopenssl/crypto/pkcs7/example.h
similarity index 100%
rename from jni/openssl/crypto/pkcs7/example.h
rename to jni/libopenssl/crypto/pkcs7/example.h
diff --git a/jni/openssl/crypto/pkcs7/info.pem b/jni/libopenssl/crypto/pkcs7/info.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/info.pem
rename to jni/libopenssl/crypto/pkcs7/info.pem
diff --git a/jni/openssl/crypto/pkcs7/infokey.pem b/jni/libopenssl/crypto/pkcs7/infokey.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/infokey.pem
rename to jni/libopenssl/crypto/pkcs7/infokey.pem
diff --git a/jni/openssl/crypto/pkcs7/p7/a1 b/jni/libopenssl/crypto/pkcs7/p7/a1
similarity index 100%
rename from jni/openssl/crypto/pkcs7/p7/a1
rename to jni/libopenssl/crypto/pkcs7/p7/a1
diff --git a/jni/openssl/crypto/pkcs7/p7/a2 b/jni/libopenssl/crypto/pkcs7/p7/a2
similarity index 100%
rename from jni/openssl/crypto/pkcs7/p7/a2
rename to jni/libopenssl/crypto/pkcs7/p7/a2
diff --git a/jni/openssl/crypto/pkcs7/p7/cert.p7c b/jni/libopenssl/crypto/pkcs7/p7/cert.p7c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/p7/cert.p7c
rename to jni/libopenssl/crypto/pkcs7/p7/cert.p7c
Binary files differ
diff --git a/jni/openssl/crypto/pkcs7/p7/smime.p7m b/jni/libopenssl/crypto/pkcs7/p7/smime.p7m
similarity index 100%
rename from jni/openssl/crypto/pkcs7/p7/smime.p7m
rename to jni/libopenssl/crypto/pkcs7/p7/smime.p7m
Binary files differ
diff --git a/jni/openssl/crypto/pkcs7/p7/smime.p7s b/jni/libopenssl/crypto/pkcs7/p7/smime.p7s
similarity index 100%
rename from jni/openssl/crypto/pkcs7/p7/smime.p7s
rename to jni/libopenssl/crypto/pkcs7/p7/smime.p7s
Binary files differ
diff --git a/jni/openssl/crypto/pkcs7/pk7_asn1.c b/jni/libopenssl/crypto/pkcs7/pk7_asn1.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_asn1.c
rename to jni/libopenssl/crypto/pkcs7/pk7_asn1.c
diff --git a/jni/openssl/crypto/pkcs7/pk7_attr.c b/jni/libopenssl/crypto/pkcs7/pk7_attr.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_attr.c
rename to jni/libopenssl/crypto/pkcs7/pk7_attr.c
diff --git a/jni/openssl/crypto/pkcs7/pk7_dgst.c b/jni/libopenssl/crypto/pkcs7/pk7_dgst.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_dgst.c
rename to jni/libopenssl/crypto/pkcs7/pk7_dgst.c
diff --git a/jni/openssl/crypto/pkcs7/pk7_doit.c b/jni/libopenssl/crypto/pkcs7/pk7_doit.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_doit.c
rename to jni/libopenssl/crypto/pkcs7/pk7_doit.c
diff --git a/jni/openssl/crypto/pkcs7/pk7_enc.c b/jni/libopenssl/crypto/pkcs7/pk7_enc.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_enc.c
rename to jni/libopenssl/crypto/pkcs7/pk7_enc.c
diff --git a/jni/openssl/crypto/pkcs7/pk7_lib.c b/jni/libopenssl/crypto/pkcs7/pk7_lib.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_lib.c
rename to jni/libopenssl/crypto/pkcs7/pk7_lib.c
diff --git a/jni/openssl/crypto/pkcs7/pk7_mime.c b/jni/libopenssl/crypto/pkcs7/pk7_mime.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_mime.c
rename to jni/libopenssl/crypto/pkcs7/pk7_mime.c
diff --git a/jni/openssl/crypto/pkcs7/pk7_smime.c b/jni/libopenssl/crypto/pkcs7/pk7_smime.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pk7_smime.c
rename to jni/libopenssl/crypto/pkcs7/pk7_smime.c
diff --git a/jni/openssl/crypto/pkcs7/pkcs7.h b/jni/libopenssl/crypto/pkcs7/pkcs7.h
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pkcs7.h
rename to jni/libopenssl/crypto/pkcs7/pkcs7.h
diff --git a/jni/openssl/crypto/pkcs7/pkcs7err.c b/jni/libopenssl/crypto/pkcs7/pkcs7err.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/pkcs7err.c
rename to jni/libopenssl/crypto/pkcs7/pkcs7err.c
diff --git a/jni/openssl/crypto/pkcs7/server.pem b/jni/libopenssl/crypto/pkcs7/server.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/server.pem
rename to jni/libopenssl/crypto/pkcs7/server.pem
diff --git a/jni/openssl/crypto/pkcs7/sign.c b/jni/libopenssl/crypto/pkcs7/sign.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/sign.c
rename to jni/libopenssl/crypto/pkcs7/sign.c
diff --git a/jni/openssl/crypto/pkcs7/t/3des.pem b/jni/libopenssl/crypto/pkcs7/t/3des.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/3des.pem
rename to jni/libopenssl/crypto/pkcs7/t/3des.pem
diff --git a/jni/openssl/crypto/pkcs7/t/3dess.pem b/jni/libopenssl/crypto/pkcs7/t/3dess.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/3dess.pem
rename to jni/libopenssl/crypto/pkcs7/t/3dess.pem
diff --git a/jni/openssl/crypto/pkcs7/t/c.pem b/jni/libopenssl/crypto/pkcs7/t/c.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/c.pem
rename to jni/libopenssl/crypto/pkcs7/t/c.pem
diff --git a/jni/openssl/crypto/pkcs7/t/ff b/jni/libopenssl/crypto/pkcs7/t/ff
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/ff
rename to jni/libopenssl/crypto/pkcs7/t/ff
diff --git a/jni/openssl/crypto/pkcs7/t/msie-e b/jni/libopenssl/crypto/pkcs7/t/msie-e
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-e
rename to jni/libopenssl/crypto/pkcs7/t/msie-e
diff --git a/jni/openssl/crypto/pkcs7/t/msie-e.pem b/jni/libopenssl/crypto/pkcs7/t/msie-e.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-e.pem
rename to jni/libopenssl/crypto/pkcs7/t/msie-e.pem
diff --git a/jni/openssl/crypto/pkcs7/t/msie-enc-01 b/jni/libopenssl/crypto/pkcs7/t/msie-enc-01
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-enc-01
rename to jni/libopenssl/crypto/pkcs7/t/msie-enc-01
diff --git a/jni/openssl/crypto/pkcs7/t/msie-enc-01.pem b/jni/libopenssl/crypto/pkcs7/t/msie-enc-01.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-enc-01.pem
rename to jni/libopenssl/crypto/pkcs7/t/msie-enc-01.pem
diff --git a/jni/openssl/crypto/pkcs7/t/msie-enc-02 b/jni/libopenssl/crypto/pkcs7/t/msie-enc-02
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-enc-02
rename to jni/libopenssl/crypto/pkcs7/t/msie-enc-02
diff --git a/jni/openssl/crypto/pkcs7/t/msie-enc-02.pem b/jni/libopenssl/crypto/pkcs7/t/msie-enc-02.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-enc-02.pem
rename to jni/libopenssl/crypto/pkcs7/t/msie-enc-02.pem
diff --git a/jni/openssl/crypto/pkcs7/t/msie-s-a-e b/jni/libopenssl/crypto/pkcs7/t/msie-s-a-e
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-s-a-e
rename to jni/libopenssl/crypto/pkcs7/t/msie-s-a-e
diff --git a/jni/openssl/crypto/pkcs7/t/msie-s-a-e.pem b/jni/libopenssl/crypto/pkcs7/t/msie-s-a-e.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/msie-s-a-e.pem
rename to jni/libopenssl/crypto/pkcs7/t/msie-s-a-e.pem
diff --git a/jni/openssl/crypto/pkcs7/t/nav-smime b/jni/libopenssl/crypto/pkcs7/t/nav-smime
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/nav-smime
rename to jni/libopenssl/crypto/pkcs7/t/nav-smime
diff --git a/jni/openssl/crypto/pkcs7/t/s.pem b/jni/libopenssl/crypto/pkcs7/t/s.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/s.pem
rename to jni/libopenssl/crypto/pkcs7/t/s.pem
diff --git a/jni/openssl/crypto/pkcs7/t/server.pem b/jni/libopenssl/crypto/pkcs7/t/server.pem
similarity index 100%
rename from jni/openssl/crypto/pkcs7/t/server.pem
rename to jni/libopenssl/crypto/pkcs7/t/server.pem
diff --git a/jni/openssl/crypto/pkcs7/verify.c b/jni/libopenssl/crypto/pkcs7/verify.c
similarity index 100%
rename from jni/openssl/crypto/pkcs7/verify.c
rename to jni/libopenssl/crypto/pkcs7/verify.c
diff --git a/jni/openssl/crypto/ppccpuid.pl b/jni/libopenssl/crypto/ppccpuid.pl
similarity index 100%
rename from jni/openssl/crypto/ppccpuid.pl
rename to jni/libopenssl/crypto/ppccpuid.pl
diff --git a/jni/openssl/crypto/pqueue/pq_test.c b/jni/libopenssl/crypto/pqueue/pq_test.c
similarity index 100%
rename from jni/openssl/crypto/pqueue/pq_test.c
rename to jni/libopenssl/crypto/pqueue/pq_test.c
diff --git a/jni/openssl/crypto/pqueue/pqueue.c b/jni/libopenssl/crypto/pqueue/pqueue.c
similarity index 100%
rename from jni/openssl/crypto/pqueue/pqueue.c
rename to jni/libopenssl/crypto/pqueue/pqueue.c
diff --git a/jni/openssl/crypto/pqueue/pqueue.h b/jni/libopenssl/crypto/pqueue/pqueue.h
similarity index 100%
rename from jni/openssl/crypto/pqueue/pqueue.h
rename to jni/libopenssl/crypto/pqueue/pqueue.h
diff --git a/jni/openssl/crypto/rand/md_rand.c b/jni/libopenssl/crypto/rand/md_rand.c
similarity index 100%
rename from jni/openssl/crypto/rand/md_rand.c
rename to jni/libopenssl/crypto/rand/md_rand.c
diff --git a/jni/openssl/crypto/rand/rand.h b/jni/libopenssl/crypto/rand/rand.h
similarity index 100%
rename from jni/openssl/crypto/rand/rand.h
rename to jni/libopenssl/crypto/rand/rand.h
diff --git a/jni/openssl/crypto/rand/rand_egd.c b/jni/libopenssl/crypto/rand/rand_egd.c
similarity index 100%
rename from jni/openssl/crypto/rand/rand_egd.c
rename to jni/libopenssl/crypto/rand/rand_egd.c
diff --git a/jni/openssl/crypto/rand/rand_err.c b/jni/libopenssl/crypto/rand/rand_err.c
similarity index 100%
rename from jni/openssl/crypto/rand/rand_err.c
rename to jni/libopenssl/crypto/rand/rand_err.c
diff --git a/jni/openssl/crypto/rand/rand_lcl.h b/jni/libopenssl/crypto/rand/rand_lcl.h
similarity index 100%
rename from jni/openssl/crypto/rand/rand_lcl.h
rename to jni/libopenssl/crypto/rand/rand_lcl.h
diff --git a/jni/openssl/crypto/rand/rand_lib.c b/jni/libopenssl/crypto/rand/rand_lib.c
similarity index 100%
rename from jni/openssl/crypto/rand/rand_lib.c
rename to jni/libopenssl/crypto/rand/rand_lib.c
diff --git a/jni/openssl/crypto/rand/rand_nw.c b/jni/libopenssl/crypto/rand/rand_nw.c
similarity index 100%
rename from jni/openssl/crypto/rand/rand_nw.c
rename to jni/libopenssl/crypto/rand/rand_nw.c
diff --git a/jni/openssl/crypto/rand/rand_os2.c b/jni/libopenssl/crypto/rand/rand_os2.c
similarity index 100%
rename from jni/openssl/crypto/rand/rand_os2.c
rename to jni/libopenssl/crypto/rand/rand_os2.c
diff --git a/jni/openssl/crypto/rand/rand_unix.c b/jni/libopenssl/crypto/rand/rand_unix.c
similarity index 100%
rename from jni/openssl/crypto/rand/rand_unix.c
rename to jni/libopenssl/crypto/rand/rand_unix.c
diff --git a/jni/openssl/crypto/rand/rand_win.c b/jni/libopenssl/crypto/rand/rand_win.c
similarity index 100%
rename from jni/openssl/crypto/rand/rand_win.c
rename to jni/libopenssl/crypto/rand/rand_win.c
diff --git a/jni/openssl/crypto/rand/randfile.c b/jni/libopenssl/crypto/rand/randfile.c
similarity index 100%
rename from jni/openssl/crypto/rand/randfile.c
rename to jni/libopenssl/crypto/rand/randfile.c
diff --git a/jni/openssl/crypto/rand/randtest.c b/jni/libopenssl/crypto/rand/randtest.c
similarity index 100%
rename from jni/openssl/crypto/rand/randtest.c
rename to jni/libopenssl/crypto/rand/randtest.c
diff --git a/jni/openssl/crypto/rc2/rc2.h b/jni/libopenssl/crypto/rc2/rc2.h
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2.h
rename to jni/libopenssl/crypto/rc2/rc2.h
diff --git a/jni/openssl/crypto/rc2/rc2_cbc.c b/jni/libopenssl/crypto/rc2/rc2_cbc.c
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2_cbc.c
rename to jni/libopenssl/crypto/rc2/rc2_cbc.c
diff --git a/jni/openssl/crypto/rc2/rc2_ecb.c b/jni/libopenssl/crypto/rc2/rc2_ecb.c
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2_ecb.c
rename to jni/libopenssl/crypto/rc2/rc2_ecb.c
diff --git a/jni/openssl/crypto/rc2/rc2_locl.h b/jni/libopenssl/crypto/rc2/rc2_locl.h
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2_locl.h
rename to jni/libopenssl/crypto/rc2/rc2_locl.h
diff --git a/jni/openssl/crypto/rc2/rc2_skey.c b/jni/libopenssl/crypto/rc2/rc2_skey.c
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2_skey.c
rename to jni/libopenssl/crypto/rc2/rc2_skey.c
diff --git a/jni/openssl/crypto/rc2/rc2cfb64.c b/jni/libopenssl/crypto/rc2/rc2cfb64.c
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2cfb64.c
rename to jni/libopenssl/crypto/rc2/rc2cfb64.c
diff --git a/jni/openssl/crypto/rc2/rc2ofb64.c b/jni/libopenssl/crypto/rc2/rc2ofb64.c
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2ofb64.c
rename to jni/libopenssl/crypto/rc2/rc2ofb64.c
diff --git a/jni/openssl/crypto/rc2/rc2speed.c b/jni/libopenssl/crypto/rc2/rc2speed.c
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2speed.c
rename to jni/libopenssl/crypto/rc2/rc2speed.c
diff --git a/jni/openssl/crypto/rc2/rc2test.c b/jni/libopenssl/crypto/rc2/rc2test.c
similarity index 100%
rename from jni/openssl/crypto/rc2/rc2test.c
rename to jni/libopenssl/crypto/rc2/rc2test.c
diff --git a/jni/openssl/crypto/rc2/rrc2.doc b/jni/libopenssl/crypto/rc2/rrc2.doc
similarity index 100%
rename from jni/openssl/crypto/rc2/rrc2.doc
rename to jni/libopenssl/crypto/rc2/rrc2.doc
diff --git a/jni/openssl/crypto/rc2/tab.c b/jni/libopenssl/crypto/rc2/tab.c
similarity index 100%
rename from jni/openssl/crypto/rc2/tab.c
rename to jni/libopenssl/crypto/rc2/tab.c
diff --git a/jni/openssl/crypto/rc2/version b/jni/libopenssl/crypto/rc2/version
similarity index 100%
rename from jni/openssl/crypto/rc2/version
rename to jni/libopenssl/crypto/rc2/version
diff --git a/jni/openssl/crypto/rc4/asm/rc4-586.pl b/jni/libopenssl/crypto/rc4/asm/rc4-586.pl
similarity index 100%
rename from jni/openssl/crypto/rc4/asm/rc4-586.pl
rename to jni/libopenssl/crypto/rc4/asm/rc4-586.pl
diff --git a/jni/openssl/crypto/rc4/asm/rc4-ia64.pl b/jni/libopenssl/crypto/rc4/asm/rc4-ia64.pl
similarity index 100%
rename from jni/openssl/crypto/rc4/asm/rc4-ia64.pl
rename to jni/libopenssl/crypto/rc4/asm/rc4-ia64.pl
diff --git a/jni/openssl/crypto/rc4/asm/rc4-s390x.pl b/jni/libopenssl/crypto/rc4/asm/rc4-s390x.pl
similarity index 100%
rename from jni/openssl/crypto/rc4/asm/rc4-s390x.pl
rename to jni/libopenssl/crypto/rc4/asm/rc4-s390x.pl
diff --git a/jni/openssl/crypto/rc4/asm/rc4-x86_64.pl b/jni/libopenssl/crypto/rc4/asm/rc4-x86_64.pl
similarity index 100%
rename from jni/openssl/crypto/rc4/asm/rc4-x86_64.pl
rename to jni/libopenssl/crypto/rc4/asm/rc4-x86_64.pl
diff --git a/jni/openssl/crypto/rc4/rc4.c b/jni/libopenssl/crypto/rc4/rc4.c
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4.c
rename to jni/libopenssl/crypto/rc4/rc4.c
diff --git a/jni/openssl/crypto/rc4/rc4.h b/jni/libopenssl/crypto/rc4/rc4.h
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4.h
rename to jni/libopenssl/crypto/rc4/rc4.h
diff --git a/jni/openssl/crypto/rc4/rc4_enc.c b/jni/libopenssl/crypto/rc4/rc4_enc.c
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4_enc.c
rename to jni/libopenssl/crypto/rc4/rc4_enc.c
diff --git a/jni/openssl/crypto/rc4/rc4_locl.h b/jni/libopenssl/crypto/rc4/rc4_locl.h
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4_locl.h
rename to jni/libopenssl/crypto/rc4/rc4_locl.h
diff --git a/jni/openssl/crypto/rc4/rc4_skey.c b/jni/libopenssl/crypto/rc4/rc4_skey.c
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4_skey.c
rename to jni/libopenssl/crypto/rc4/rc4_skey.c
diff --git a/jni/openssl/crypto/rc4/rc4s.cpp b/jni/libopenssl/crypto/rc4/rc4s.cpp
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4s.cpp
rename to jni/libopenssl/crypto/rc4/rc4s.cpp
diff --git a/jni/openssl/crypto/rc4/rc4speed.c b/jni/libopenssl/crypto/rc4/rc4speed.c
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4speed.c
rename to jni/libopenssl/crypto/rc4/rc4speed.c
diff --git a/jni/openssl/crypto/rc4/rc4test.c b/jni/libopenssl/crypto/rc4/rc4test.c
similarity index 100%
rename from jni/openssl/crypto/rc4/rc4test.c
rename to jni/libopenssl/crypto/rc4/rc4test.c
diff --git a/jni/openssl/crypto/rc4/rrc4.doc b/jni/libopenssl/crypto/rc4/rrc4.doc
similarity index 100%
rename from jni/openssl/crypto/rc4/rrc4.doc
rename to jni/libopenssl/crypto/rc4/rrc4.doc
diff --git a/jni/openssl/crypto/ripemd/README b/jni/libopenssl/crypto/ripemd/README
similarity index 100%
rename from jni/openssl/crypto/ripemd/README
rename to jni/libopenssl/crypto/ripemd/README
diff --git a/jni/openssl/crypto/ripemd/asm/rips.cpp b/jni/libopenssl/crypto/ripemd/asm/rips.cpp
similarity index 100%
rename from jni/openssl/crypto/ripemd/asm/rips.cpp
rename to jni/libopenssl/crypto/ripemd/asm/rips.cpp
diff --git a/jni/openssl/crypto/ripemd/asm/rmd-586.pl b/jni/libopenssl/crypto/ripemd/asm/rmd-586.pl
similarity index 100%
rename from jni/openssl/crypto/ripemd/asm/rmd-586.pl
rename to jni/libopenssl/crypto/ripemd/asm/rmd-586.pl
diff --git a/jni/openssl/crypto/ripemd/ripemd.h b/jni/libopenssl/crypto/ripemd/ripemd.h
similarity index 100%
rename from jni/openssl/crypto/ripemd/ripemd.h
rename to jni/libopenssl/crypto/ripemd/ripemd.h
diff --git a/jni/openssl/crypto/ripemd/rmd160.c b/jni/libopenssl/crypto/ripemd/rmd160.c
similarity index 100%
rename from jni/openssl/crypto/ripemd/rmd160.c
rename to jni/libopenssl/crypto/ripemd/rmd160.c
diff --git a/jni/openssl/crypto/ripemd/rmd_dgst.c b/jni/libopenssl/crypto/ripemd/rmd_dgst.c
similarity index 100%
rename from jni/openssl/crypto/ripemd/rmd_dgst.c
rename to jni/libopenssl/crypto/ripemd/rmd_dgst.c
diff --git a/jni/openssl/crypto/ripemd/rmd_locl.h b/jni/libopenssl/crypto/ripemd/rmd_locl.h
similarity index 100%
rename from jni/openssl/crypto/ripemd/rmd_locl.h
rename to jni/libopenssl/crypto/ripemd/rmd_locl.h
diff --git a/jni/openssl/crypto/ripemd/rmd_one.c b/jni/libopenssl/crypto/ripemd/rmd_one.c
similarity index 100%
rename from jni/openssl/crypto/ripemd/rmd_one.c
rename to jni/libopenssl/crypto/ripemd/rmd_one.c
diff --git a/jni/openssl/crypto/ripemd/rmdconst.h b/jni/libopenssl/crypto/ripemd/rmdconst.h
similarity index 100%
rename from jni/openssl/crypto/ripemd/rmdconst.h
rename to jni/libopenssl/crypto/ripemd/rmdconst.h
diff --git a/jni/openssl/crypto/ripemd/rmdtest.c b/jni/libopenssl/crypto/ripemd/rmdtest.c
similarity index 100%
rename from jni/openssl/crypto/ripemd/rmdtest.c
rename to jni/libopenssl/crypto/ripemd/rmdtest.c
diff --git a/jni/openssl/crypto/rsa/rsa.h b/jni/libopenssl/crypto/rsa/rsa.h
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa.h
rename to jni/libopenssl/crypto/rsa/rsa.h
diff --git a/jni/openssl/crypto/rsa/rsa_ameth.c b/jni/libopenssl/crypto/rsa/rsa_ameth.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_ameth.c
rename to jni/libopenssl/crypto/rsa/rsa_ameth.c
diff --git a/jni/openssl/crypto/rsa/rsa_asn1.c b/jni/libopenssl/crypto/rsa/rsa_asn1.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_asn1.c
rename to jni/libopenssl/crypto/rsa/rsa_asn1.c
diff --git a/jni/openssl/crypto/rsa/rsa_chk.c b/jni/libopenssl/crypto/rsa/rsa_chk.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_chk.c
rename to jni/libopenssl/crypto/rsa/rsa_chk.c
diff --git a/jni/openssl/crypto/rsa/rsa_depr.c b/jni/libopenssl/crypto/rsa/rsa_depr.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_depr.c
rename to jni/libopenssl/crypto/rsa/rsa_depr.c
diff --git a/jni/openssl/crypto/rsa/rsa_eay.c b/jni/libopenssl/crypto/rsa/rsa_eay.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_eay.c
rename to jni/libopenssl/crypto/rsa/rsa_eay.c
diff --git a/jni/openssl/crypto/rsa/rsa_err.c b/jni/libopenssl/crypto/rsa/rsa_err.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_err.c
rename to jni/libopenssl/crypto/rsa/rsa_err.c
diff --git a/jni/openssl/crypto/rsa/rsa_gen.c b/jni/libopenssl/crypto/rsa/rsa_gen.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_gen.c
rename to jni/libopenssl/crypto/rsa/rsa_gen.c
diff --git a/jni/openssl/crypto/rsa/rsa_lib.c b/jni/libopenssl/crypto/rsa/rsa_lib.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_lib.c
rename to jni/libopenssl/crypto/rsa/rsa_lib.c
diff --git a/jni/openssl/crypto/rsa/rsa_locl.h b/jni/libopenssl/crypto/rsa/rsa_locl.h
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_locl.h
rename to jni/libopenssl/crypto/rsa/rsa_locl.h
diff --git a/jni/openssl/crypto/rsa/rsa_none.c b/jni/libopenssl/crypto/rsa/rsa_none.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_none.c
rename to jni/libopenssl/crypto/rsa/rsa_none.c
diff --git a/jni/openssl/crypto/rsa/rsa_null.c b/jni/libopenssl/crypto/rsa/rsa_null.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_null.c
rename to jni/libopenssl/crypto/rsa/rsa_null.c
diff --git a/jni/openssl/crypto/rsa/rsa_oaep.c b/jni/libopenssl/crypto/rsa/rsa_oaep.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_oaep.c
rename to jni/libopenssl/crypto/rsa/rsa_oaep.c
diff --git a/jni/openssl/crypto/rsa/rsa_pk1.c b/jni/libopenssl/crypto/rsa/rsa_pk1.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_pk1.c
rename to jni/libopenssl/crypto/rsa/rsa_pk1.c
diff --git a/jni/openssl/crypto/rsa/rsa_pmeth.c b/jni/libopenssl/crypto/rsa/rsa_pmeth.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_pmeth.c
rename to jni/libopenssl/crypto/rsa/rsa_pmeth.c
diff --git a/jni/openssl/crypto/rsa/rsa_prn.c b/jni/libopenssl/crypto/rsa/rsa_prn.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_prn.c
rename to jni/libopenssl/crypto/rsa/rsa_prn.c
diff --git a/jni/openssl/crypto/rsa/rsa_pss.c b/jni/libopenssl/crypto/rsa/rsa_pss.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_pss.c
rename to jni/libopenssl/crypto/rsa/rsa_pss.c
diff --git a/jni/openssl/crypto/rsa/rsa_saos.c b/jni/libopenssl/crypto/rsa/rsa_saos.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_saos.c
rename to jni/libopenssl/crypto/rsa/rsa_saos.c
diff --git a/jni/openssl/crypto/rsa/rsa_sign.c b/jni/libopenssl/crypto/rsa/rsa_sign.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_sign.c
rename to jni/libopenssl/crypto/rsa/rsa_sign.c
diff --git a/jni/openssl/crypto/rsa/rsa_ssl.c b/jni/libopenssl/crypto/rsa/rsa_ssl.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_ssl.c
rename to jni/libopenssl/crypto/rsa/rsa_ssl.c
diff --git a/jni/openssl/crypto/rsa/rsa_test.c b/jni/libopenssl/crypto/rsa/rsa_test.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_test.c
rename to jni/libopenssl/crypto/rsa/rsa_test.c
diff --git a/jni/openssl/crypto/rsa/rsa_x931.c b/jni/libopenssl/crypto/rsa/rsa_x931.c
similarity index 100%
rename from jni/openssl/crypto/rsa/rsa_x931.c
rename to jni/libopenssl/crypto/rsa/rsa_x931.c
diff --git a/jni/openssl/crypto/s390xcap.c b/jni/libopenssl/crypto/s390xcap.c
similarity index 100%
rename from jni/openssl/crypto/s390xcap.c
rename to jni/libopenssl/crypto/s390xcap.c
diff --git a/jni/openssl/crypto/s390xcpuid.S b/jni/libopenssl/crypto/s390xcpuid.S
similarity index 100%
rename from jni/openssl/crypto/s390xcpuid.S
rename to jni/libopenssl/crypto/s390xcpuid.S
diff --git a/jni/openssl/crypto/sha/asm/README b/jni/libopenssl/crypto/sha/asm/README
similarity index 100%
rename from jni/openssl/crypto/sha/asm/README
rename to jni/libopenssl/crypto/sha/asm/README
diff --git a/jni/openssl/crypto/sha/asm/sha1-586.pl b/jni/libopenssl/crypto/sha/asm/sha1-586.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-586.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-586.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-armv4-large.pl b/jni/libopenssl/crypto/sha/asm/sha1-armv4-large.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-armv4-large.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-armv4-large.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-armv4-large.s b/jni/libopenssl/crypto/sha/asm/sha1-armv4-large.s
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-armv4-large.s
rename to jni/libopenssl/crypto/sha/asm/sha1-armv4-large.s
diff --git a/jni/openssl/crypto/sha/asm/sha1-ia64.pl b/jni/libopenssl/crypto/sha/asm/sha1-ia64.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-ia64.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-ia64.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-ppc.pl b/jni/libopenssl/crypto/sha/asm/sha1-ppc.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-ppc.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-ppc.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-s390x.pl b/jni/libopenssl/crypto/sha/asm/sha1-s390x.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-s390x.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-s390x.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-sparcv9.pl b/jni/libopenssl/crypto/sha/asm/sha1-sparcv9.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-sparcv9.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-sparcv9.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-sparcv9a.pl b/jni/libopenssl/crypto/sha/asm/sha1-sparcv9a.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-sparcv9a.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-sparcv9a.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-thumb.pl b/jni/libopenssl/crypto/sha/asm/sha1-thumb.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-thumb.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-thumb.pl
diff --git a/jni/openssl/crypto/sha/asm/sha1-x86_64.pl b/jni/libopenssl/crypto/sha/asm/sha1-x86_64.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha1-x86_64.pl
rename to jni/libopenssl/crypto/sha/asm/sha1-x86_64.pl
diff --git a/jni/openssl/crypto/sha/asm/sha256-586.pl b/jni/libopenssl/crypto/sha/asm/sha256-586.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha256-586.pl
rename to jni/libopenssl/crypto/sha/asm/sha256-586.pl
diff --git a/jni/openssl/crypto/sha/asm/sha256-armv4.pl b/jni/libopenssl/crypto/sha/asm/sha256-armv4.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha256-armv4.pl
rename to jni/libopenssl/crypto/sha/asm/sha256-armv4.pl
diff --git a/jni/openssl/crypto/sha/asm/sha256-armv4.s b/jni/libopenssl/crypto/sha/asm/sha256-armv4.s
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha256-armv4.s
rename to jni/libopenssl/crypto/sha/asm/sha256-armv4.s
diff --git a/jni/openssl/crypto/sha/asm/sha512-586.pl b/jni/libopenssl/crypto/sha/asm/sha512-586.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-586.pl
rename to jni/libopenssl/crypto/sha/asm/sha512-586.pl
diff --git a/jni/openssl/crypto/sha/asm/sha512-armv4.pl b/jni/libopenssl/crypto/sha/asm/sha512-armv4.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-armv4.pl
rename to jni/libopenssl/crypto/sha/asm/sha512-armv4.pl
diff --git a/jni/openssl/crypto/sha/asm/sha512-armv4.s b/jni/libopenssl/crypto/sha/asm/sha512-armv4.s
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-armv4.s
rename to jni/libopenssl/crypto/sha/asm/sha512-armv4.s
diff --git a/jni/openssl/crypto/sha/asm/sha512-ia64.pl b/jni/libopenssl/crypto/sha/asm/sha512-ia64.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-ia64.pl
rename to jni/libopenssl/crypto/sha/asm/sha512-ia64.pl
diff --git a/jni/openssl/crypto/sha/asm/sha512-ppc.pl b/jni/libopenssl/crypto/sha/asm/sha512-ppc.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-ppc.pl
rename to jni/libopenssl/crypto/sha/asm/sha512-ppc.pl
diff --git a/jni/openssl/crypto/sha/asm/sha512-s390x.pl b/jni/libopenssl/crypto/sha/asm/sha512-s390x.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-s390x.pl
rename to jni/libopenssl/crypto/sha/asm/sha512-s390x.pl
diff --git a/jni/openssl/crypto/sha/asm/sha512-sparcv9.pl b/jni/libopenssl/crypto/sha/asm/sha512-sparcv9.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-sparcv9.pl
rename to jni/libopenssl/crypto/sha/asm/sha512-sparcv9.pl
diff --git a/jni/openssl/crypto/sha/asm/sha512-x86_64.pl b/jni/libopenssl/crypto/sha/asm/sha512-x86_64.pl
similarity index 100%
rename from jni/openssl/crypto/sha/asm/sha512-x86_64.pl
rename to jni/libopenssl/crypto/sha/asm/sha512-x86_64.pl
diff --git a/jni/openssl/crypto/sha/sha.c b/jni/libopenssl/crypto/sha/sha.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha.c
rename to jni/libopenssl/crypto/sha/sha.c
diff --git a/jni/openssl/crypto/sha/sha.h b/jni/libopenssl/crypto/sha/sha.h
similarity index 100%
rename from jni/openssl/crypto/sha/sha.h
rename to jni/libopenssl/crypto/sha/sha.h
diff --git a/jni/openssl/crypto/sha/sha1.c b/jni/libopenssl/crypto/sha/sha1.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha1.c
rename to jni/libopenssl/crypto/sha/sha1.c
diff --git a/jni/openssl/crypto/sha/sha1_one.c b/jni/libopenssl/crypto/sha/sha1_one.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha1_one.c
rename to jni/libopenssl/crypto/sha/sha1_one.c
diff --git a/jni/openssl/crypto/sha/sha1dgst.c b/jni/libopenssl/crypto/sha/sha1dgst.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha1dgst.c
rename to jni/libopenssl/crypto/sha/sha1dgst.c
diff --git a/jni/openssl/crypto/sha/sha1test.c b/jni/libopenssl/crypto/sha/sha1test.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha1test.c
rename to jni/libopenssl/crypto/sha/sha1test.c
diff --git a/jni/openssl/crypto/sha/sha256.c b/jni/libopenssl/crypto/sha/sha256.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha256.c
rename to jni/libopenssl/crypto/sha/sha256.c
diff --git a/jni/openssl/crypto/sha/sha256t.c b/jni/libopenssl/crypto/sha/sha256t.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha256t.c
rename to jni/libopenssl/crypto/sha/sha256t.c
diff --git a/jni/openssl/crypto/sha/sha512.c b/jni/libopenssl/crypto/sha/sha512.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha512.c
rename to jni/libopenssl/crypto/sha/sha512.c
diff --git a/jni/openssl/crypto/sha/sha512t.c b/jni/libopenssl/crypto/sha/sha512t.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha512t.c
rename to jni/libopenssl/crypto/sha/sha512t.c
diff --git a/jni/openssl/crypto/sha/sha_dgst.c b/jni/libopenssl/crypto/sha/sha_dgst.c
similarity index 100%
rename from jni/openssl/crypto/sha/sha_dgst.c
rename to jni/libopenssl/crypto/sha/sha_dgst.c
diff --git a/jni/openssl/crypto/sha/sha_locl.h b/jni/libopenssl/crypto/sha/sha_locl.h
similarity index 100%
rename from jni/openssl/crypto/sha/sha_locl.h
rename to jni/libopenssl/crypto/sha/sha_locl.h
diff --git a/jni/openssl/crypto/sha/shatest.c b/jni/libopenssl/crypto/sha/shatest.c
similarity index 100%
rename from jni/openssl/crypto/sha/shatest.c
rename to jni/libopenssl/crypto/sha/shatest.c
diff --git a/jni/openssl/crypto/sparccpuid.S b/jni/libopenssl/crypto/sparccpuid.S
similarity index 100%
rename from jni/openssl/crypto/sparccpuid.S
rename to jni/libopenssl/crypto/sparccpuid.S
diff --git a/jni/openssl/crypto/sparcv9cap.c b/jni/libopenssl/crypto/sparcv9cap.c
similarity index 100%
rename from jni/openssl/crypto/sparcv9cap.c
rename to jni/libopenssl/crypto/sparcv9cap.c
diff --git a/jni/openssl/crypto/stack/safestack.h b/jni/libopenssl/crypto/stack/safestack.h
similarity index 100%
rename from jni/openssl/crypto/stack/safestack.h
rename to jni/libopenssl/crypto/stack/safestack.h
diff --git a/jni/openssl/crypto/stack/stack.c b/jni/libopenssl/crypto/stack/stack.c
similarity index 100%
rename from jni/openssl/crypto/stack/stack.c
rename to jni/libopenssl/crypto/stack/stack.c
diff --git a/jni/openssl/crypto/stack/stack.h b/jni/libopenssl/crypto/stack/stack.h
similarity index 100%
rename from jni/openssl/crypto/stack/stack.h
rename to jni/libopenssl/crypto/stack/stack.h
diff --git a/jni/openssl/crypto/store/README b/jni/libopenssl/crypto/store/README
similarity index 100%
rename from jni/openssl/crypto/store/README
rename to jni/libopenssl/crypto/store/README
diff --git a/jni/openssl/crypto/store/store.h b/jni/libopenssl/crypto/store/store.h
similarity index 100%
rename from jni/openssl/crypto/store/store.h
rename to jni/libopenssl/crypto/store/store.h
diff --git a/jni/openssl/crypto/store/str_err.c b/jni/libopenssl/crypto/store/str_err.c
similarity index 100%
rename from jni/openssl/crypto/store/str_err.c
rename to jni/libopenssl/crypto/store/str_err.c
diff --git a/jni/openssl/crypto/store/str_lib.c b/jni/libopenssl/crypto/store/str_lib.c
similarity index 100%
rename from jni/openssl/crypto/store/str_lib.c
rename to jni/libopenssl/crypto/store/str_lib.c
diff --git a/jni/openssl/crypto/store/str_locl.h b/jni/libopenssl/crypto/store/str_locl.h
similarity index 100%
rename from jni/openssl/crypto/store/str_locl.h
rename to jni/libopenssl/crypto/store/str_locl.h
diff --git a/jni/openssl/crypto/store/str_mem.c b/jni/libopenssl/crypto/store/str_mem.c
similarity index 100%
rename from jni/openssl/crypto/store/str_mem.c
rename to jni/libopenssl/crypto/store/str_mem.c
diff --git a/jni/openssl/crypto/store/str_meth.c b/jni/libopenssl/crypto/store/str_meth.c
similarity index 100%
rename from jni/openssl/crypto/store/str_meth.c
rename to jni/libopenssl/crypto/store/str_meth.c
diff --git a/jni/openssl/crypto/symhacks.h b/jni/libopenssl/crypto/symhacks.h
similarity index 100%
rename from jni/openssl/crypto/symhacks.h
rename to jni/libopenssl/crypto/symhacks.h
diff --git a/jni/openssl/crypto/threads/README b/jni/libopenssl/crypto/threads/README
similarity index 100%
rename from jni/openssl/crypto/threads/README
rename to jni/libopenssl/crypto/threads/README
diff --git a/jni/openssl/crypto/threads/mttest.c b/jni/libopenssl/crypto/threads/mttest.c
similarity index 100%
rename from jni/openssl/crypto/threads/mttest.c
rename to jni/libopenssl/crypto/threads/mttest.c
diff --git a/jni/openssl/crypto/threads/netware.bat b/jni/libopenssl/crypto/threads/netware.bat
similarity index 100%
rename from jni/openssl/crypto/threads/netware.bat
rename to jni/libopenssl/crypto/threads/netware.bat
diff --git a/jni/openssl/crypto/threads/profile.sh b/jni/libopenssl/crypto/threads/profile.sh
similarity index 100%
rename from jni/openssl/crypto/threads/profile.sh
rename to jni/libopenssl/crypto/threads/profile.sh
diff --git a/jni/openssl/crypto/threads/ptest.bat b/jni/libopenssl/crypto/threads/ptest.bat
similarity index 100%
rename from jni/openssl/crypto/threads/ptest.bat
rename to jni/libopenssl/crypto/threads/ptest.bat
diff --git a/jni/openssl/crypto/threads/pthread.sh b/jni/libopenssl/crypto/threads/pthread.sh
similarity index 100%
rename from jni/openssl/crypto/threads/pthread.sh
rename to jni/libopenssl/crypto/threads/pthread.sh
diff --git a/jni/openssl/crypto/threads/pthread2.sh b/jni/libopenssl/crypto/threads/pthread2.sh
similarity index 100%
rename from jni/openssl/crypto/threads/pthread2.sh
rename to jni/libopenssl/crypto/threads/pthread2.sh
diff --git a/jni/openssl/crypto/threads/purify.sh b/jni/libopenssl/crypto/threads/purify.sh
similarity index 100%
rename from jni/openssl/crypto/threads/purify.sh
rename to jni/libopenssl/crypto/threads/purify.sh
diff --git a/jni/openssl/crypto/threads/solaris.sh b/jni/libopenssl/crypto/threads/solaris.sh
similarity index 100%
rename from jni/openssl/crypto/threads/solaris.sh
rename to jni/libopenssl/crypto/threads/solaris.sh
diff --git a/jni/openssl/crypto/threads/th-lock.c b/jni/libopenssl/crypto/threads/th-lock.c
similarity index 100%
rename from jni/openssl/crypto/threads/th-lock.c
rename to jni/libopenssl/crypto/threads/th-lock.c
diff --git a/jni/openssl/crypto/ts/ts_err.c b/jni/libopenssl/crypto/ts/ts_err.c
similarity index 100%
rename from jni/openssl/crypto/ts/ts_err.c
rename to jni/libopenssl/crypto/ts/ts_err.c
diff --git a/jni/openssl/crypto/txt_db/txt_db.c b/jni/libopenssl/crypto/txt_db/txt_db.c
similarity index 100%
rename from jni/openssl/crypto/txt_db/txt_db.c
rename to jni/libopenssl/crypto/txt_db/txt_db.c
diff --git a/jni/openssl/crypto/txt_db/txt_db.h b/jni/libopenssl/crypto/txt_db/txt_db.h
similarity index 100%
rename from jni/openssl/crypto/txt_db/txt_db.h
rename to jni/libopenssl/crypto/txt_db/txt_db.h
diff --git a/jni/openssl/crypto/ui/ui.h b/jni/libopenssl/crypto/ui/ui.h
similarity index 100%
rename from jni/openssl/crypto/ui/ui.h
rename to jni/libopenssl/crypto/ui/ui.h
diff --git a/jni/openssl/crypto/ui/ui_compat.c b/jni/libopenssl/crypto/ui/ui_compat.c
similarity index 100%
rename from jni/openssl/crypto/ui/ui_compat.c
rename to jni/libopenssl/crypto/ui/ui_compat.c
diff --git a/jni/openssl/crypto/ui/ui_compat.h b/jni/libopenssl/crypto/ui/ui_compat.h
similarity index 100%
rename from jni/openssl/crypto/ui/ui_compat.h
rename to jni/libopenssl/crypto/ui/ui_compat.h
diff --git a/jni/openssl/crypto/ui/ui_err.c b/jni/libopenssl/crypto/ui/ui_err.c
similarity index 100%
rename from jni/openssl/crypto/ui/ui_err.c
rename to jni/libopenssl/crypto/ui/ui_err.c
diff --git a/jni/openssl/crypto/ui/ui_lib.c b/jni/libopenssl/crypto/ui/ui_lib.c
similarity index 100%
rename from jni/openssl/crypto/ui/ui_lib.c
rename to jni/libopenssl/crypto/ui/ui_lib.c
diff --git a/jni/openssl/crypto/ui/ui_locl.h b/jni/libopenssl/crypto/ui/ui_locl.h
similarity index 100%
rename from jni/openssl/crypto/ui/ui_locl.h
rename to jni/libopenssl/crypto/ui/ui_locl.h
diff --git a/jni/openssl/crypto/ui/ui_openssl.c b/jni/libopenssl/crypto/ui/ui_openssl.c
similarity index 100%
rename from jni/openssl/crypto/ui/ui_openssl.c
rename to jni/libopenssl/crypto/ui/ui_openssl.c
diff --git a/jni/openssl/crypto/ui/ui_util.c b/jni/libopenssl/crypto/ui/ui_util.c
similarity index 100%
rename from jni/openssl/crypto/ui/ui_util.c
rename to jni/libopenssl/crypto/ui/ui_util.c
diff --git a/jni/openssl/crypto/uid.c b/jni/libopenssl/crypto/uid.c
similarity index 100%
rename from jni/openssl/crypto/uid.c
rename to jni/libopenssl/crypto/uid.c
diff --git a/jni/openssl/crypto/x509/by_dir.c b/jni/libopenssl/crypto/x509/by_dir.c
similarity index 100%
rename from jni/openssl/crypto/x509/by_dir.c
rename to jni/libopenssl/crypto/x509/by_dir.c
diff --git a/jni/openssl/crypto/x509/by_file.c b/jni/libopenssl/crypto/x509/by_file.c
similarity index 100%
rename from jni/openssl/crypto/x509/by_file.c
rename to jni/libopenssl/crypto/x509/by_file.c
diff --git a/jni/openssl/crypto/x509/x509.h b/jni/libopenssl/crypto/x509/x509.h
similarity index 100%
rename from jni/openssl/crypto/x509/x509.h
rename to jni/libopenssl/crypto/x509/x509.h
diff --git a/jni/openssl/crypto/x509/x509_att.c b/jni/libopenssl/crypto/x509/x509_att.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_att.c
rename to jni/libopenssl/crypto/x509/x509_att.c
diff --git a/jni/openssl/crypto/x509/x509_cmp.c b/jni/libopenssl/crypto/x509/x509_cmp.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_cmp.c
rename to jni/libopenssl/crypto/x509/x509_cmp.c
diff --git a/jni/openssl/crypto/x509/x509_d2.c b/jni/libopenssl/crypto/x509/x509_d2.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_d2.c
rename to jni/libopenssl/crypto/x509/x509_d2.c
diff --git a/jni/openssl/crypto/x509/x509_def.c b/jni/libopenssl/crypto/x509/x509_def.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_def.c
rename to jni/libopenssl/crypto/x509/x509_def.c
diff --git a/jni/openssl/crypto/x509/x509_err.c b/jni/libopenssl/crypto/x509/x509_err.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_err.c
rename to jni/libopenssl/crypto/x509/x509_err.c
diff --git a/jni/openssl/crypto/x509/x509_ext.c b/jni/libopenssl/crypto/x509/x509_ext.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_ext.c
rename to jni/libopenssl/crypto/x509/x509_ext.c
diff --git a/jni/openssl/crypto/x509/x509_lu.c b/jni/libopenssl/crypto/x509/x509_lu.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_lu.c
rename to jni/libopenssl/crypto/x509/x509_lu.c
diff --git a/jni/openssl/crypto/x509/x509_obj.c b/jni/libopenssl/crypto/x509/x509_obj.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_obj.c
rename to jni/libopenssl/crypto/x509/x509_obj.c
diff --git a/jni/openssl/crypto/x509/x509_r2x.c b/jni/libopenssl/crypto/x509/x509_r2x.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_r2x.c
rename to jni/libopenssl/crypto/x509/x509_r2x.c
diff --git a/jni/openssl/crypto/x509/x509_req.c b/jni/libopenssl/crypto/x509/x509_req.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_req.c
rename to jni/libopenssl/crypto/x509/x509_req.c
diff --git a/jni/openssl/crypto/x509/x509_set.c b/jni/libopenssl/crypto/x509/x509_set.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_set.c
rename to jni/libopenssl/crypto/x509/x509_set.c
diff --git a/jni/openssl/crypto/x509/x509_trs.c b/jni/libopenssl/crypto/x509/x509_trs.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_trs.c
rename to jni/libopenssl/crypto/x509/x509_trs.c
diff --git a/jni/openssl/crypto/x509/x509_txt.c b/jni/libopenssl/crypto/x509/x509_txt.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_txt.c
rename to jni/libopenssl/crypto/x509/x509_txt.c
diff --git a/jni/openssl/crypto/x509/x509_v3.c b/jni/libopenssl/crypto/x509/x509_v3.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_v3.c
rename to jni/libopenssl/crypto/x509/x509_v3.c
diff --git a/jni/openssl/crypto/x509/x509_vfy.c b/jni/libopenssl/crypto/x509/x509_vfy.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_vfy.c
rename to jni/libopenssl/crypto/x509/x509_vfy.c
diff --git a/jni/openssl/crypto/x509/x509_vfy.h b/jni/libopenssl/crypto/x509/x509_vfy.h
similarity index 100%
rename from jni/openssl/crypto/x509/x509_vfy.h
rename to jni/libopenssl/crypto/x509/x509_vfy.h
diff --git a/jni/openssl/crypto/x509/x509_vpm.c b/jni/libopenssl/crypto/x509/x509_vpm.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509_vpm.c
rename to jni/libopenssl/crypto/x509/x509_vpm.c
diff --git a/jni/openssl/crypto/x509/x509cset.c b/jni/libopenssl/crypto/x509/x509cset.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509cset.c
rename to jni/libopenssl/crypto/x509/x509cset.c
diff --git a/jni/openssl/crypto/x509/x509name.c b/jni/libopenssl/crypto/x509/x509name.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509name.c
rename to jni/libopenssl/crypto/x509/x509name.c
diff --git a/jni/openssl/crypto/x509/x509rset.c b/jni/libopenssl/crypto/x509/x509rset.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509rset.c
rename to jni/libopenssl/crypto/x509/x509rset.c
diff --git a/jni/openssl/crypto/x509/x509spki.c b/jni/libopenssl/crypto/x509/x509spki.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509spki.c
rename to jni/libopenssl/crypto/x509/x509spki.c
diff --git a/jni/openssl/crypto/x509/x509type.c b/jni/libopenssl/crypto/x509/x509type.c
similarity index 100%
rename from jni/openssl/crypto/x509/x509type.c
rename to jni/libopenssl/crypto/x509/x509type.c
diff --git a/jni/openssl/crypto/x509/x_all.c b/jni/libopenssl/crypto/x509/x_all.c
similarity index 100%
rename from jni/openssl/crypto/x509/x_all.c
rename to jni/libopenssl/crypto/x509/x_all.c
diff --git a/jni/openssl/crypto/x509v3/ext_dat.h b/jni/libopenssl/crypto/x509v3/ext_dat.h
similarity index 100%
rename from jni/openssl/crypto/x509v3/ext_dat.h
rename to jni/libopenssl/crypto/x509v3/ext_dat.h
diff --git a/jni/openssl/crypto/x509v3/pcy_cache.c b/jni/libopenssl/crypto/x509v3/pcy_cache.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/pcy_cache.c
rename to jni/libopenssl/crypto/x509v3/pcy_cache.c
diff --git a/jni/openssl/crypto/x509v3/pcy_data.c b/jni/libopenssl/crypto/x509v3/pcy_data.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/pcy_data.c
rename to jni/libopenssl/crypto/x509v3/pcy_data.c
diff --git a/jni/openssl/crypto/x509v3/pcy_int.h b/jni/libopenssl/crypto/x509v3/pcy_int.h
similarity index 100%
rename from jni/openssl/crypto/x509v3/pcy_int.h
rename to jni/libopenssl/crypto/x509v3/pcy_int.h
diff --git a/jni/openssl/crypto/x509v3/pcy_lib.c b/jni/libopenssl/crypto/x509v3/pcy_lib.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/pcy_lib.c
rename to jni/libopenssl/crypto/x509v3/pcy_lib.c
diff --git a/jni/openssl/crypto/x509v3/pcy_map.c b/jni/libopenssl/crypto/x509v3/pcy_map.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/pcy_map.c
rename to jni/libopenssl/crypto/x509v3/pcy_map.c
diff --git a/jni/openssl/crypto/x509v3/pcy_node.c b/jni/libopenssl/crypto/x509v3/pcy_node.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/pcy_node.c
rename to jni/libopenssl/crypto/x509v3/pcy_node.c
diff --git a/jni/openssl/crypto/x509v3/pcy_tree.c b/jni/libopenssl/crypto/x509v3/pcy_tree.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/pcy_tree.c
rename to jni/libopenssl/crypto/x509v3/pcy_tree.c
diff --git a/jni/openssl/crypto/x509v3/tabtest.c b/jni/libopenssl/crypto/x509v3/tabtest.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/tabtest.c
rename to jni/libopenssl/crypto/x509v3/tabtest.c
diff --git a/jni/openssl/crypto/x509v3/v3_addr.c b/jni/libopenssl/crypto/x509v3/v3_addr.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_addr.c
rename to jni/libopenssl/crypto/x509v3/v3_addr.c
diff --git a/jni/openssl/crypto/x509v3/v3_akey.c b/jni/libopenssl/crypto/x509v3/v3_akey.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_akey.c
rename to jni/libopenssl/crypto/x509v3/v3_akey.c
diff --git a/jni/openssl/crypto/x509v3/v3_akeya.c b/jni/libopenssl/crypto/x509v3/v3_akeya.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_akeya.c
rename to jni/libopenssl/crypto/x509v3/v3_akeya.c
diff --git a/jni/openssl/crypto/x509v3/v3_alt.c b/jni/libopenssl/crypto/x509v3/v3_alt.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_alt.c
rename to jni/libopenssl/crypto/x509v3/v3_alt.c
diff --git a/jni/openssl/crypto/x509v3/v3_asid.c b/jni/libopenssl/crypto/x509v3/v3_asid.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_asid.c
rename to jni/libopenssl/crypto/x509v3/v3_asid.c
diff --git a/jni/openssl/crypto/x509v3/v3_bcons.c b/jni/libopenssl/crypto/x509v3/v3_bcons.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_bcons.c
rename to jni/libopenssl/crypto/x509v3/v3_bcons.c
diff --git a/jni/openssl/crypto/x509v3/v3_bitst.c b/jni/libopenssl/crypto/x509v3/v3_bitst.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_bitst.c
rename to jni/libopenssl/crypto/x509v3/v3_bitst.c
diff --git a/jni/openssl/crypto/x509v3/v3_conf.c b/jni/libopenssl/crypto/x509v3/v3_conf.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_conf.c
rename to jni/libopenssl/crypto/x509v3/v3_conf.c
diff --git a/jni/openssl/crypto/x509v3/v3_cpols.c b/jni/libopenssl/crypto/x509v3/v3_cpols.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_cpols.c
rename to jni/libopenssl/crypto/x509v3/v3_cpols.c
diff --git a/jni/openssl/crypto/x509v3/v3_crld.c b/jni/libopenssl/crypto/x509v3/v3_crld.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_crld.c
rename to jni/libopenssl/crypto/x509v3/v3_crld.c
diff --git a/jni/openssl/crypto/x509v3/v3_enum.c b/jni/libopenssl/crypto/x509v3/v3_enum.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_enum.c
rename to jni/libopenssl/crypto/x509v3/v3_enum.c
diff --git a/jni/openssl/crypto/x509v3/v3_extku.c b/jni/libopenssl/crypto/x509v3/v3_extku.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_extku.c
rename to jni/libopenssl/crypto/x509v3/v3_extku.c
diff --git a/jni/openssl/crypto/x509v3/v3_genn.c b/jni/libopenssl/crypto/x509v3/v3_genn.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_genn.c
rename to jni/libopenssl/crypto/x509v3/v3_genn.c
diff --git a/jni/openssl/crypto/x509v3/v3_ia5.c b/jni/libopenssl/crypto/x509v3/v3_ia5.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_ia5.c
rename to jni/libopenssl/crypto/x509v3/v3_ia5.c
diff --git a/jni/openssl/crypto/x509v3/v3_info.c b/jni/libopenssl/crypto/x509v3/v3_info.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_info.c
rename to jni/libopenssl/crypto/x509v3/v3_info.c
diff --git a/jni/openssl/crypto/x509v3/v3_int.c b/jni/libopenssl/crypto/x509v3/v3_int.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_int.c
rename to jni/libopenssl/crypto/x509v3/v3_int.c
diff --git a/jni/openssl/crypto/x509v3/v3_lib.c b/jni/libopenssl/crypto/x509v3/v3_lib.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_lib.c
rename to jni/libopenssl/crypto/x509v3/v3_lib.c
diff --git a/jni/openssl/crypto/x509v3/v3_ncons.c b/jni/libopenssl/crypto/x509v3/v3_ncons.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_ncons.c
rename to jni/libopenssl/crypto/x509v3/v3_ncons.c
diff --git a/jni/openssl/crypto/x509v3/v3_ocsp.c b/jni/libopenssl/crypto/x509v3/v3_ocsp.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_ocsp.c
rename to jni/libopenssl/crypto/x509v3/v3_ocsp.c
diff --git a/jni/openssl/crypto/x509v3/v3_pci.c b/jni/libopenssl/crypto/x509v3/v3_pci.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_pci.c
rename to jni/libopenssl/crypto/x509v3/v3_pci.c
diff --git a/jni/openssl/crypto/x509v3/v3_pcia.c b/jni/libopenssl/crypto/x509v3/v3_pcia.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_pcia.c
rename to jni/libopenssl/crypto/x509v3/v3_pcia.c
diff --git a/jni/openssl/crypto/x509v3/v3_pcons.c b/jni/libopenssl/crypto/x509v3/v3_pcons.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_pcons.c
rename to jni/libopenssl/crypto/x509v3/v3_pcons.c
diff --git a/jni/openssl/crypto/x509v3/v3_pku.c b/jni/libopenssl/crypto/x509v3/v3_pku.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_pku.c
rename to jni/libopenssl/crypto/x509v3/v3_pku.c
diff --git a/jni/openssl/crypto/x509v3/v3_pmaps.c b/jni/libopenssl/crypto/x509v3/v3_pmaps.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_pmaps.c
rename to jni/libopenssl/crypto/x509v3/v3_pmaps.c
diff --git a/jni/openssl/crypto/x509v3/v3_prn.c b/jni/libopenssl/crypto/x509v3/v3_prn.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_prn.c
rename to jni/libopenssl/crypto/x509v3/v3_prn.c
diff --git a/jni/openssl/crypto/x509v3/v3_purp.c b/jni/libopenssl/crypto/x509v3/v3_purp.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_purp.c
rename to jni/libopenssl/crypto/x509v3/v3_purp.c
diff --git a/jni/openssl/crypto/x509v3/v3_skey.c b/jni/libopenssl/crypto/x509v3/v3_skey.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_skey.c
rename to jni/libopenssl/crypto/x509v3/v3_skey.c
diff --git a/jni/openssl/crypto/x509v3/v3_sxnet.c b/jni/libopenssl/crypto/x509v3/v3_sxnet.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_sxnet.c
rename to jni/libopenssl/crypto/x509v3/v3_sxnet.c
diff --git a/jni/openssl/crypto/x509v3/v3_utl.c b/jni/libopenssl/crypto/x509v3/v3_utl.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3_utl.c
rename to jni/libopenssl/crypto/x509v3/v3_utl.c
diff --git a/jni/openssl/crypto/x509v3/v3conf.c b/jni/libopenssl/crypto/x509v3/v3conf.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3conf.c
rename to jni/libopenssl/crypto/x509v3/v3conf.c
diff --git a/jni/openssl/crypto/x509v3/v3err.c b/jni/libopenssl/crypto/x509v3/v3err.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3err.c
rename to jni/libopenssl/crypto/x509v3/v3err.c
diff --git a/jni/openssl/crypto/x509v3/v3prin.c b/jni/libopenssl/crypto/x509v3/v3prin.c
similarity index 100%
rename from jni/openssl/crypto/x509v3/v3prin.c
rename to jni/libopenssl/crypto/x509v3/v3prin.c
diff --git a/jni/openssl/crypto/x509v3/x509v3.h b/jni/libopenssl/crypto/x509v3/x509v3.h
similarity index 100%
rename from jni/openssl/crypto/x509v3/x509v3.h
rename to jni/libopenssl/crypto/x509v3/x509v3.h
diff --git a/jni/openssl/crypto/x86_64cpuid.pl b/jni/libopenssl/crypto/x86_64cpuid.pl
similarity index 100%
rename from jni/openssl/crypto/x86_64cpuid.pl
rename to jni/libopenssl/crypto/x86_64cpuid.pl
diff --git a/jni/openssl/crypto/x86cpuid.pl b/jni/libopenssl/crypto/x86cpuid.pl
similarity index 100%
rename from jni/openssl/crypto/x86cpuid.pl
rename to jni/libopenssl/crypto/x86cpuid.pl
diff --git a/jni/openssl/e_os.h b/jni/libopenssl/e_os.h
similarity index 100%
rename from jni/openssl/e_os.h
rename to jni/libopenssl/e_os.h
diff --git a/jni/openssl/e_os2.h b/jni/libopenssl/e_os2.h
similarity index 100%
rename from jni/openssl/e_os2.h
rename to jni/libopenssl/e_os2.h
diff --git a/jni/openssl/import_openssl.sh b/jni/libopenssl/import_openssl.sh
similarity index 100%
rename from jni/openssl/import_openssl.sh
rename to jni/libopenssl/import_openssl.sh
diff --git a/jni/openssl/include/openssl/aes.h b/jni/libopenssl/include/openssl/aes.h
similarity index 100%
rename from jni/openssl/include/openssl/aes.h
rename to jni/libopenssl/include/openssl/aes.h
diff --git a/jni/openssl/include/openssl/asn1.h b/jni/libopenssl/include/openssl/asn1.h
similarity index 100%
rename from jni/openssl/include/openssl/asn1.h
rename to jni/libopenssl/include/openssl/asn1.h
diff --git a/jni/openssl/include/openssl/asn1_mac.h b/jni/libopenssl/include/openssl/asn1_mac.h
similarity index 100%
rename from jni/openssl/include/openssl/asn1_mac.h
rename to jni/libopenssl/include/openssl/asn1_mac.h
diff --git a/jni/openssl/include/openssl/asn1t.h b/jni/libopenssl/include/openssl/asn1t.h
similarity index 100%
rename from jni/openssl/include/openssl/asn1t.h
rename to jni/libopenssl/include/openssl/asn1t.h
diff --git a/jni/openssl/include/openssl/bio.h b/jni/libopenssl/include/openssl/bio.h
similarity index 100%
rename from jni/openssl/include/openssl/bio.h
rename to jni/libopenssl/include/openssl/bio.h
diff --git a/jni/openssl/include/openssl/blowfish.h b/jni/libopenssl/include/openssl/blowfish.h
similarity index 100%
rename from jni/openssl/include/openssl/blowfish.h
rename to jni/libopenssl/include/openssl/blowfish.h
diff --git a/jni/openssl/include/openssl/bn.h b/jni/libopenssl/include/openssl/bn.h
similarity index 100%
rename from jni/openssl/include/openssl/bn.h
rename to jni/libopenssl/include/openssl/bn.h
diff --git a/jni/openssl/include/openssl/buffer.h b/jni/libopenssl/include/openssl/buffer.h
similarity index 100%
rename from jni/openssl/include/openssl/buffer.h
rename to jni/libopenssl/include/openssl/buffer.h
diff --git a/jni/openssl/include/openssl/comp.h b/jni/libopenssl/include/openssl/comp.h
similarity index 100%
rename from jni/openssl/include/openssl/comp.h
rename to jni/libopenssl/include/openssl/comp.h
diff --git a/jni/openssl/include/openssl/conf.h b/jni/libopenssl/include/openssl/conf.h
similarity index 100%
rename from jni/openssl/include/openssl/conf.h
rename to jni/libopenssl/include/openssl/conf.h
diff --git a/jni/openssl/include/openssl/conf_api.h b/jni/libopenssl/include/openssl/conf_api.h
similarity index 100%
rename from jni/openssl/include/openssl/conf_api.h
rename to jni/libopenssl/include/openssl/conf_api.h
diff --git a/jni/openssl/include/openssl/crypto.h b/jni/libopenssl/include/openssl/crypto.h
similarity index 100%
rename from jni/openssl/include/openssl/crypto.h
rename to jni/libopenssl/include/openssl/crypto.h
diff --git a/jni/openssl/include/openssl/des.h b/jni/libopenssl/include/openssl/des.h
similarity index 100%
rename from jni/openssl/include/openssl/des.h
rename to jni/libopenssl/include/openssl/des.h
diff --git a/jni/openssl/include/openssl/des_old.h b/jni/libopenssl/include/openssl/des_old.h
similarity index 100%
rename from jni/openssl/include/openssl/des_old.h
rename to jni/libopenssl/include/openssl/des_old.h
diff --git a/jni/openssl/include/openssl/dh.h b/jni/libopenssl/include/openssl/dh.h
similarity index 100%
rename from jni/openssl/include/openssl/dh.h
rename to jni/libopenssl/include/openssl/dh.h
diff --git a/jni/openssl/include/openssl/dsa.h b/jni/libopenssl/include/openssl/dsa.h
similarity index 100%
rename from jni/openssl/include/openssl/dsa.h
rename to jni/libopenssl/include/openssl/dsa.h
diff --git a/jni/openssl/include/openssl/dso.h b/jni/libopenssl/include/openssl/dso.h
similarity index 100%
rename from jni/openssl/include/openssl/dso.h
rename to jni/libopenssl/include/openssl/dso.h
diff --git a/jni/openssl/include/openssl/dtls1.h b/jni/libopenssl/include/openssl/dtls1.h
similarity index 100%
rename from jni/openssl/include/openssl/dtls1.h
rename to jni/libopenssl/include/openssl/dtls1.h
diff --git a/jni/openssl/include/openssl/e_os2.h b/jni/libopenssl/include/openssl/e_os2.h
similarity index 100%
rename from jni/openssl/include/openssl/e_os2.h
rename to jni/libopenssl/include/openssl/e_os2.h
diff --git a/jni/openssl/include/openssl/ebcdic.h b/jni/libopenssl/include/openssl/ebcdic.h
similarity index 100%
rename from jni/openssl/include/openssl/ebcdic.h
rename to jni/libopenssl/include/openssl/ebcdic.h
diff --git a/jni/openssl/include/openssl/ec.h b/jni/libopenssl/include/openssl/ec.h
similarity index 100%
rename from jni/openssl/include/openssl/ec.h
rename to jni/libopenssl/include/openssl/ec.h
diff --git a/jni/openssl/include/openssl/ecdh.h b/jni/libopenssl/include/openssl/ecdh.h
similarity index 100%
rename from jni/openssl/include/openssl/ecdh.h
rename to jni/libopenssl/include/openssl/ecdh.h
diff --git a/jni/openssl/include/openssl/ecdsa.h b/jni/libopenssl/include/openssl/ecdsa.h
similarity index 100%
rename from jni/openssl/include/openssl/ecdsa.h
rename to jni/libopenssl/include/openssl/ecdsa.h
diff --git a/jni/openssl/include/openssl/engine.h b/jni/libopenssl/include/openssl/engine.h
similarity index 100%
rename from jni/openssl/include/openssl/engine.h
rename to jni/libopenssl/include/openssl/engine.h
diff --git a/jni/openssl/include/openssl/err.h b/jni/libopenssl/include/openssl/err.h
similarity index 100%
rename from jni/openssl/include/openssl/err.h
rename to jni/libopenssl/include/openssl/err.h
diff --git a/jni/openssl/include/openssl/evp.h b/jni/libopenssl/include/openssl/evp.h
similarity index 100%
rename from jni/openssl/include/openssl/evp.h
rename to jni/libopenssl/include/openssl/evp.h
diff --git a/jni/openssl/include/openssl/hmac.h b/jni/libopenssl/include/openssl/hmac.h
similarity index 100%
rename from jni/openssl/include/openssl/hmac.h
rename to jni/libopenssl/include/openssl/hmac.h
diff --git a/jni/openssl/include/openssl/krb5_asn.h b/jni/libopenssl/include/openssl/krb5_asn.h
similarity index 100%
rename from jni/openssl/include/openssl/krb5_asn.h
rename to jni/libopenssl/include/openssl/krb5_asn.h
diff --git a/jni/openssl/include/openssl/kssl.h b/jni/libopenssl/include/openssl/kssl.h
similarity index 100%
rename from jni/openssl/include/openssl/kssl.h
rename to jni/libopenssl/include/openssl/kssl.h
diff --git a/jni/openssl/include/openssl/lhash.h b/jni/libopenssl/include/openssl/lhash.h
similarity index 100%
rename from jni/openssl/include/openssl/lhash.h
rename to jni/libopenssl/include/openssl/lhash.h
diff --git a/jni/openssl/include/openssl/md4.h b/jni/libopenssl/include/openssl/md4.h
similarity index 100%
rename from jni/openssl/include/openssl/md4.h
rename to jni/libopenssl/include/openssl/md4.h
diff --git a/jni/openssl/include/openssl/md5.h b/jni/libopenssl/include/openssl/md5.h
similarity index 100%
rename from jni/openssl/include/openssl/md5.h
rename to jni/libopenssl/include/openssl/md5.h
diff --git a/jni/openssl/include/openssl/modes.h b/jni/libopenssl/include/openssl/modes.h
similarity index 100%
rename from jni/openssl/include/openssl/modes.h
rename to jni/libopenssl/include/openssl/modes.h
diff --git a/jni/openssl/include/openssl/obj_mac.h b/jni/libopenssl/include/openssl/obj_mac.h
similarity index 100%
rename from jni/openssl/include/openssl/obj_mac.h
rename to jni/libopenssl/include/openssl/obj_mac.h
diff --git a/jni/openssl/include/openssl/objects.h b/jni/libopenssl/include/openssl/objects.h
similarity index 100%
rename from jni/openssl/include/openssl/objects.h
rename to jni/libopenssl/include/openssl/objects.h
diff --git a/jni/openssl/include/openssl/ocsp.h b/jni/libopenssl/include/openssl/ocsp.h
similarity index 100%
rename from jni/openssl/include/openssl/ocsp.h
rename to jni/libopenssl/include/openssl/ocsp.h
diff --git a/jni/openssl/include/openssl/opensslconf.h b/jni/libopenssl/include/openssl/opensslconf.h
similarity index 100%
rename from jni/openssl/include/openssl/opensslconf.h
rename to jni/libopenssl/include/openssl/opensslconf.h
diff --git a/jni/openssl/include/openssl/opensslv.h b/jni/libopenssl/include/openssl/opensslv.h
similarity index 100%
rename from jni/openssl/include/openssl/opensslv.h
rename to jni/libopenssl/include/openssl/opensslv.h
diff --git a/jni/openssl/include/openssl/ossl_typ.h b/jni/libopenssl/include/openssl/ossl_typ.h
similarity index 100%
rename from jni/openssl/include/openssl/ossl_typ.h
rename to jni/libopenssl/include/openssl/ossl_typ.h
diff --git a/jni/openssl/include/openssl/pem.h b/jni/libopenssl/include/openssl/pem.h
similarity index 100%
rename from jni/openssl/include/openssl/pem.h
rename to jni/libopenssl/include/openssl/pem.h
diff --git a/jni/openssl/include/openssl/pem2.h b/jni/libopenssl/include/openssl/pem2.h
similarity index 100%
rename from jni/openssl/include/openssl/pem2.h
rename to jni/libopenssl/include/openssl/pem2.h
diff --git a/jni/openssl/include/openssl/pkcs12.h b/jni/libopenssl/include/openssl/pkcs12.h
similarity index 100%
rename from jni/openssl/include/openssl/pkcs12.h
rename to jni/libopenssl/include/openssl/pkcs12.h
diff --git a/jni/openssl/include/openssl/pkcs7.h b/jni/libopenssl/include/openssl/pkcs7.h
similarity index 100%
rename from jni/openssl/include/openssl/pkcs7.h
rename to jni/libopenssl/include/openssl/pkcs7.h
diff --git a/jni/openssl/include/openssl/pqueue.h b/jni/libopenssl/include/openssl/pqueue.h
similarity index 100%
rename from jni/openssl/include/openssl/pqueue.h
rename to jni/libopenssl/include/openssl/pqueue.h
diff --git a/jni/openssl/include/openssl/rand.h b/jni/libopenssl/include/openssl/rand.h
similarity index 100%
rename from jni/openssl/include/openssl/rand.h
rename to jni/libopenssl/include/openssl/rand.h
diff --git a/jni/openssl/include/openssl/rc2.h b/jni/libopenssl/include/openssl/rc2.h
similarity index 100%
rename from jni/openssl/include/openssl/rc2.h
rename to jni/libopenssl/include/openssl/rc2.h
diff --git a/jni/openssl/include/openssl/rc4.h b/jni/libopenssl/include/openssl/rc4.h
similarity index 100%
rename from jni/openssl/include/openssl/rc4.h
rename to jni/libopenssl/include/openssl/rc4.h
diff --git a/jni/openssl/include/openssl/ripemd.h b/jni/libopenssl/include/openssl/ripemd.h
similarity index 100%
rename from jni/openssl/include/openssl/ripemd.h
rename to jni/libopenssl/include/openssl/ripemd.h
diff --git a/jni/openssl/include/openssl/rsa.h b/jni/libopenssl/include/openssl/rsa.h
similarity index 100%
rename from jni/openssl/include/openssl/rsa.h
rename to jni/libopenssl/include/openssl/rsa.h
diff --git a/jni/openssl/include/openssl/safestack.h b/jni/libopenssl/include/openssl/safestack.h
similarity index 100%
rename from jni/openssl/include/openssl/safestack.h
rename to jni/libopenssl/include/openssl/safestack.h
diff --git a/jni/openssl/include/openssl/sha.h b/jni/libopenssl/include/openssl/sha.h
similarity index 100%
rename from jni/openssl/include/openssl/sha.h
rename to jni/libopenssl/include/openssl/sha.h
diff --git a/jni/openssl/include/openssl/ssl.h b/jni/libopenssl/include/openssl/ssl.h
similarity index 100%
rename from jni/openssl/include/openssl/ssl.h
rename to jni/libopenssl/include/openssl/ssl.h
diff --git a/jni/openssl/include/openssl/ssl2.h b/jni/libopenssl/include/openssl/ssl2.h
similarity index 100%
rename from jni/openssl/include/openssl/ssl2.h
rename to jni/libopenssl/include/openssl/ssl2.h
diff --git a/jni/openssl/include/openssl/ssl23.h b/jni/libopenssl/include/openssl/ssl23.h
similarity index 100%
rename from jni/openssl/include/openssl/ssl23.h
rename to jni/libopenssl/include/openssl/ssl23.h
diff --git a/jni/openssl/include/openssl/ssl3.h b/jni/libopenssl/include/openssl/ssl3.h
similarity index 100%
rename from jni/openssl/include/openssl/ssl3.h
rename to jni/libopenssl/include/openssl/ssl3.h
diff --git a/jni/openssl/include/openssl/stack.h b/jni/libopenssl/include/openssl/stack.h
similarity index 100%
rename from jni/openssl/include/openssl/stack.h
rename to jni/libopenssl/include/openssl/stack.h
diff --git a/jni/openssl/include/openssl/symhacks.h b/jni/libopenssl/include/openssl/symhacks.h
similarity index 100%
rename from jni/openssl/include/openssl/symhacks.h
rename to jni/libopenssl/include/openssl/symhacks.h
diff --git a/jni/openssl/include/openssl/tls1.h b/jni/libopenssl/include/openssl/tls1.h
similarity index 100%
rename from jni/openssl/include/openssl/tls1.h
rename to jni/libopenssl/include/openssl/tls1.h
diff --git a/jni/openssl/include/openssl/ts.h b/jni/libopenssl/include/openssl/ts.h
similarity index 100%
rename from jni/openssl/include/openssl/ts.h
rename to jni/libopenssl/include/openssl/ts.h
diff --git a/jni/openssl/include/openssl/txt_db.h b/jni/libopenssl/include/openssl/txt_db.h
similarity index 100%
rename from jni/openssl/include/openssl/txt_db.h
rename to jni/libopenssl/include/openssl/txt_db.h
diff --git a/jni/openssl/include/openssl/ui.h b/jni/libopenssl/include/openssl/ui.h
similarity index 100%
rename from jni/openssl/include/openssl/ui.h
rename to jni/libopenssl/include/openssl/ui.h
diff --git a/jni/openssl/include/openssl/ui_compat.h b/jni/libopenssl/include/openssl/ui_compat.h
similarity index 100%
rename from jni/openssl/include/openssl/ui_compat.h
rename to jni/libopenssl/include/openssl/ui_compat.h
diff --git a/jni/openssl/include/openssl/x509.h b/jni/libopenssl/include/openssl/x509.h
similarity index 100%
rename from jni/openssl/include/openssl/x509.h
rename to jni/libopenssl/include/openssl/x509.h
diff --git a/jni/openssl/include/openssl/x509_vfy.h b/jni/libopenssl/include/openssl/x509_vfy.h
similarity index 100%
rename from jni/openssl/include/openssl/x509_vfy.h
rename to jni/libopenssl/include/openssl/x509_vfy.h
diff --git a/jni/openssl/include/openssl/x509v3.h b/jni/libopenssl/include/openssl/x509v3.h
similarity index 100%
rename from jni/openssl/include/openssl/x509v3.h
rename to jni/libopenssl/include/openssl/x509v3.h
diff --git a/jni/openssl/openssl.config b/jni/libopenssl/openssl.config
similarity index 100%
rename from jni/openssl/openssl.config
rename to jni/libopenssl/openssl.config
diff --git a/jni/openssl/openssl.version b/jni/libopenssl/openssl.version
similarity index 100%
rename from jni/openssl/openssl.version
rename to jni/libopenssl/openssl.version
diff --git a/jni/openssl/patches/README b/jni/libopenssl/patches/README
similarity index 100%
rename from jni/openssl/patches/README
rename to jni/libopenssl/patches/README
diff --git a/jni/openssl/patches/apps_Android.mk b/jni/libopenssl/patches/apps_Android.mk
similarity index 100%
rename from jni/openssl/patches/apps_Android.mk
rename to jni/libopenssl/patches/apps_Android.mk
diff --git a/jni/openssl/patches/crypto_Android.mk b/jni/libopenssl/patches/crypto_Android.mk
similarity index 100%
rename from jni/openssl/patches/crypto_Android.mk
rename to jni/libopenssl/patches/crypto_Android.mk
diff --git a/jni/openssl/patches/handshake_cutthrough.patch b/jni/libopenssl/patches/handshake_cutthrough.patch
similarity index 100%
rename from jni/openssl/patches/handshake_cutthrough.patch
rename to jni/libopenssl/patches/handshake_cutthrough.patch
diff --git a/jni/openssl/patches/jsse.patch b/jni/libopenssl/patches/jsse.patch
similarity index 100%
rename from jni/openssl/patches/jsse.patch
rename to jni/libopenssl/patches/jsse.patch
diff --git a/jni/openssl/patches/npn.patch b/jni/libopenssl/patches/npn.patch
similarity index 100%
rename from jni/openssl/patches/npn.patch
rename to jni/libopenssl/patches/npn.patch
diff --git a/jni/openssl/patches/progs.patch b/jni/libopenssl/patches/progs.patch
similarity index 100%
rename from jni/openssl/patches/progs.patch
rename to jni/libopenssl/patches/progs.patch
diff --git a/jni/openssl/patches/sha1_armv4_large.patch b/jni/libopenssl/patches/sha1_armv4_large.patch
similarity index 100%
rename from jni/openssl/patches/sha1_armv4_large.patch
rename to jni/libopenssl/patches/sha1_armv4_large.patch
diff --git a/jni/openssl/patches/small_records.patch b/jni/libopenssl/patches/small_records.patch
similarity index 100%
rename from jni/openssl/patches/small_records.patch
rename to jni/libopenssl/patches/small_records.patch
diff --git a/jni/openssl/patches/ssl_Android.mk b/jni/libopenssl/patches/ssl_Android.mk
similarity index 100%
rename from jni/openssl/patches/ssl_Android.mk
rename to jni/libopenssl/patches/ssl_Android.mk
diff --git a/jni/openssl/patches/sslv3_uninit_padding.patch b/jni/libopenssl/patches/sslv3_uninit_padding.patch
similarity index 100%
rename from jni/openssl/patches/sslv3_uninit_padding.patch
rename to jni/libopenssl/patches/sslv3_uninit_padding.patch
diff --git a/jni/openssl/patches/testssl.sh b/jni/libopenssl/patches/testssl.sh
similarity index 100%
rename from jni/openssl/patches/testssl.sh
rename to jni/libopenssl/patches/testssl.sh
diff --git a/jni/openssl/ssl/Android.mk b/jni/libopenssl/ssl/Android.mk
similarity index 100%
rename from jni/openssl/ssl/Android.mk
rename to jni/libopenssl/ssl/Android.mk
diff --git a/jni/openssl/ssl/Makefile b/jni/libopenssl/ssl/Makefile
similarity index 100%
rename from jni/openssl/ssl/Makefile
rename to jni/libopenssl/ssl/Makefile
diff --git a/jni/openssl/ssl/bio_ssl.c b/jni/libopenssl/ssl/bio_ssl.c
similarity index 100%
rename from jni/openssl/ssl/bio_ssl.c
rename to jni/libopenssl/ssl/bio_ssl.c
diff --git a/jni/openssl/ssl/d1_both.c b/jni/libopenssl/ssl/d1_both.c
similarity index 100%
rename from jni/openssl/ssl/d1_both.c
rename to jni/libopenssl/ssl/d1_both.c
diff --git a/jni/openssl/ssl/d1_clnt.c b/jni/libopenssl/ssl/d1_clnt.c
similarity index 100%
rename from jni/openssl/ssl/d1_clnt.c
rename to jni/libopenssl/ssl/d1_clnt.c
diff --git a/jni/openssl/ssl/d1_enc.c b/jni/libopenssl/ssl/d1_enc.c
similarity index 100%
rename from jni/openssl/ssl/d1_enc.c
rename to jni/libopenssl/ssl/d1_enc.c
diff --git a/jni/openssl/ssl/d1_lib.c b/jni/libopenssl/ssl/d1_lib.c
similarity index 100%
rename from jni/openssl/ssl/d1_lib.c
rename to jni/libopenssl/ssl/d1_lib.c
diff --git a/jni/openssl/ssl/d1_meth.c b/jni/libopenssl/ssl/d1_meth.c
similarity index 100%
rename from jni/openssl/ssl/d1_meth.c
rename to jni/libopenssl/ssl/d1_meth.c
diff --git a/jni/openssl/ssl/d1_pkt.c b/jni/libopenssl/ssl/d1_pkt.c
similarity index 100%
rename from jni/openssl/ssl/d1_pkt.c
rename to jni/libopenssl/ssl/d1_pkt.c
diff --git a/jni/openssl/ssl/d1_srvr.c b/jni/libopenssl/ssl/d1_srvr.c
similarity index 100%
rename from jni/openssl/ssl/d1_srvr.c
rename to jni/libopenssl/ssl/d1_srvr.c
diff --git a/jni/openssl/ssl/dtls1.h b/jni/libopenssl/ssl/dtls1.h
similarity index 100%
rename from jni/openssl/ssl/dtls1.h
rename to jni/libopenssl/ssl/dtls1.h
diff --git a/jni/openssl/ssl/kssl.c b/jni/libopenssl/ssl/kssl.c
similarity index 100%
rename from jni/openssl/ssl/kssl.c
rename to jni/libopenssl/ssl/kssl.c
diff --git a/jni/openssl/ssl/kssl.h b/jni/libopenssl/ssl/kssl.h
similarity index 100%
rename from jni/openssl/ssl/kssl.h
rename to jni/libopenssl/ssl/kssl.h
diff --git a/jni/openssl/ssl/kssl_lcl.h b/jni/libopenssl/ssl/kssl_lcl.h
similarity index 100%
rename from jni/openssl/ssl/kssl_lcl.h
rename to jni/libopenssl/ssl/kssl_lcl.h
diff --git a/jni/openssl/ssl/s23_clnt.c b/jni/libopenssl/ssl/s23_clnt.c
similarity index 100%
rename from jni/openssl/ssl/s23_clnt.c
rename to jni/libopenssl/ssl/s23_clnt.c
diff --git a/jni/openssl/ssl/s23_lib.c b/jni/libopenssl/ssl/s23_lib.c
similarity index 100%
rename from jni/openssl/ssl/s23_lib.c
rename to jni/libopenssl/ssl/s23_lib.c
diff --git a/jni/openssl/ssl/s23_meth.c b/jni/libopenssl/ssl/s23_meth.c
similarity index 100%
rename from jni/openssl/ssl/s23_meth.c
rename to jni/libopenssl/ssl/s23_meth.c
diff --git a/jni/openssl/ssl/s23_pkt.c b/jni/libopenssl/ssl/s23_pkt.c
similarity index 100%
rename from jni/openssl/ssl/s23_pkt.c
rename to jni/libopenssl/ssl/s23_pkt.c
diff --git a/jni/openssl/ssl/s23_srvr.c b/jni/libopenssl/ssl/s23_srvr.c
similarity index 100%
rename from jni/openssl/ssl/s23_srvr.c
rename to jni/libopenssl/ssl/s23_srvr.c
diff --git a/jni/openssl/ssl/s2_clnt.c b/jni/libopenssl/ssl/s2_clnt.c
similarity index 100%
rename from jni/openssl/ssl/s2_clnt.c
rename to jni/libopenssl/ssl/s2_clnt.c
diff --git a/jni/openssl/ssl/s2_enc.c b/jni/libopenssl/ssl/s2_enc.c
similarity index 100%
rename from jni/openssl/ssl/s2_enc.c
rename to jni/libopenssl/ssl/s2_enc.c
diff --git a/jni/openssl/ssl/s2_lib.c b/jni/libopenssl/ssl/s2_lib.c
similarity index 100%
rename from jni/openssl/ssl/s2_lib.c
rename to jni/libopenssl/ssl/s2_lib.c
diff --git a/jni/openssl/ssl/s2_meth.c b/jni/libopenssl/ssl/s2_meth.c
similarity index 100%
rename from jni/openssl/ssl/s2_meth.c
rename to jni/libopenssl/ssl/s2_meth.c
diff --git a/jni/openssl/ssl/s2_pkt.c b/jni/libopenssl/ssl/s2_pkt.c
similarity index 100%
rename from jni/openssl/ssl/s2_pkt.c
rename to jni/libopenssl/ssl/s2_pkt.c
diff --git a/jni/openssl/ssl/s2_srvr.c b/jni/libopenssl/ssl/s2_srvr.c
similarity index 100%
rename from jni/openssl/ssl/s2_srvr.c
rename to jni/libopenssl/ssl/s2_srvr.c
diff --git a/jni/openssl/ssl/s3_both.c b/jni/libopenssl/ssl/s3_both.c
similarity index 100%
rename from jni/openssl/ssl/s3_both.c
rename to jni/libopenssl/ssl/s3_both.c
diff --git a/jni/openssl/ssl/s3_clnt.c b/jni/libopenssl/ssl/s3_clnt.c
similarity index 100%
rename from jni/openssl/ssl/s3_clnt.c
rename to jni/libopenssl/ssl/s3_clnt.c
diff --git a/jni/openssl/ssl/s3_enc.c b/jni/libopenssl/ssl/s3_enc.c
similarity index 100%
rename from jni/openssl/ssl/s3_enc.c
rename to jni/libopenssl/ssl/s3_enc.c
diff --git a/jni/openssl/ssl/s3_lib.c b/jni/libopenssl/ssl/s3_lib.c
similarity index 100%
rename from jni/openssl/ssl/s3_lib.c
rename to jni/libopenssl/ssl/s3_lib.c
diff --git a/jni/openssl/ssl/s3_meth.c b/jni/libopenssl/ssl/s3_meth.c
similarity index 100%
rename from jni/openssl/ssl/s3_meth.c
rename to jni/libopenssl/ssl/s3_meth.c
diff --git a/jni/openssl/ssl/s3_pkt.c b/jni/libopenssl/ssl/s3_pkt.c
similarity index 100%
rename from jni/openssl/ssl/s3_pkt.c
rename to jni/libopenssl/ssl/s3_pkt.c
diff --git a/jni/openssl/ssl/s3_srvr.c b/jni/libopenssl/ssl/s3_srvr.c
similarity index 100%
rename from jni/openssl/ssl/s3_srvr.c
rename to jni/libopenssl/ssl/s3_srvr.c
diff --git a/jni/openssl/ssl/ssl.h b/jni/libopenssl/ssl/ssl.h
similarity index 100%
rename from jni/openssl/ssl/ssl.h
rename to jni/libopenssl/ssl/ssl.h
diff --git a/jni/openssl/ssl/ssl2.h b/jni/libopenssl/ssl/ssl2.h
similarity index 100%
rename from jni/openssl/ssl/ssl2.h
rename to jni/libopenssl/ssl/ssl2.h
diff --git a/jni/openssl/ssl/ssl23.h b/jni/libopenssl/ssl/ssl23.h
similarity index 100%
rename from jni/openssl/ssl/ssl23.h
rename to jni/libopenssl/ssl/ssl23.h
diff --git a/jni/openssl/ssl/ssl3.h b/jni/libopenssl/ssl/ssl3.h
similarity index 100%
rename from jni/openssl/ssl/ssl3.h
rename to jni/libopenssl/ssl/ssl3.h
diff --git a/jni/openssl/ssl/ssl_algs.c b/jni/libopenssl/ssl/ssl_algs.c
similarity index 100%
rename from jni/openssl/ssl/ssl_algs.c
rename to jni/libopenssl/ssl/ssl_algs.c
diff --git a/jni/openssl/ssl/ssl_asn1.c b/jni/libopenssl/ssl/ssl_asn1.c
similarity index 100%
rename from jni/openssl/ssl/ssl_asn1.c
rename to jni/libopenssl/ssl/ssl_asn1.c
diff --git a/jni/openssl/ssl/ssl_cert.c b/jni/libopenssl/ssl/ssl_cert.c
similarity index 100%
rename from jni/openssl/ssl/ssl_cert.c
rename to jni/libopenssl/ssl/ssl_cert.c
diff --git a/jni/openssl/ssl/ssl_ciph.c b/jni/libopenssl/ssl/ssl_ciph.c
similarity index 100%
rename from jni/openssl/ssl/ssl_ciph.c
rename to jni/libopenssl/ssl/ssl_ciph.c
diff --git a/jni/openssl/ssl/ssl_err.c b/jni/libopenssl/ssl/ssl_err.c
similarity index 100%
rename from jni/openssl/ssl/ssl_err.c
rename to jni/libopenssl/ssl/ssl_err.c
diff --git a/jni/openssl/ssl/ssl_err2.c b/jni/libopenssl/ssl/ssl_err2.c
similarity index 100%
rename from jni/openssl/ssl/ssl_err2.c
rename to jni/libopenssl/ssl/ssl_err2.c
diff --git a/jni/openssl/ssl/ssl_lib.c b/jni/libopenssl/ssl/ssl_lib.c
similarity index 100%
rename from jni/openssl/ssl/ssl_lib.c
rename to jni/libopenssl/ssl/ssl_lib.c
diff --git a/jni/openssl/ssl/ssl_locl.h b/jni/libopenssl/ssl/ssl_locl.h
similarity index 100%
rename from jni/openssl/ssl/ssl_locl.h
rename to jni/libopenssl/ssl/ssl_locl.h
diff --git a/jni/openssl/ssl/ssl_rsa.c b/jni/libopenssl/ssl/ssl_rsa.c
similarity index 100%
rename from jni/openssl/ssl/ssl_rsa.c
rename to jni/libopenssl/ssl/ssl_rsa.c
diff --git a/jni/openssl/ssl/ssl_sess.c b/jni/libopenssl/ssl/ssl_sess.c
similarity index 100%
rename from jni/openssl/ssl/ssl_sess.c
rename to jni/libopenssl/ssl/ssl_sess.c
diff --git a/jni/openssl/ssl/ssl_stat.c b/jni/libopenssl/ssl/ssl_stat.c
similarity index 100%
rename from jni/openssl/ssl/ssl_stat.c
rename to jni/libopenssl/ssl/ssl_stat.c
diff --git a/jni/openssl/ssl/ssl_txt.c b/jni/libopenssl/ssl/ssl_txt.c
similarity index 100%
rename from jni/openssl/ssl/ssl_txt.c
rename to jni/libopenssl/ssl/ssl_txt.c
diff --git a/jni/openssl/ssl/ssltest.c b/jni/libopenssl/ssl/ssltest.c
similarity index 100%
rename from jni/openssl/ssl/ssltest.c
rename to jni/libopenssl/ssl/ssltest.c
diff --git a/jni/openssl/ssl/t1_clnt.c b/jni/libopenssl/ssl/t1_clnt.c
similarity index 100%
rename from jni/openssl/ssl/t1_clnt.c
rename to jni/libopenssl/ssl/t1_clnt.c
diff --git a/jni/openssl/ssl/t1_enc.c b/jni/libopenssl/ssl/t1_enc.c
similarity index 100%
rename from jni/openssl/ssl/t1_enc.c
rename to jni/libopenssl/ssl/t1_enc.c
diff --git a/jni/openssl/ssl/t1_lib.c b/jni/libopenssl/ssl/t1_lib.c
similarity index 100%
rename from jni/openssl/ssl/t1_lib.c
rename to jni/libopenssl/ssl/t1_lib.c
diff --git a/jni/openssl/ssl/t1_meth.c b/jni/libopenssl/ssl/t1_meth.c
similarity index 100%
rename from jni/openssl/ssl/t1_meth.c
rename to jni/libopenssl/ssl/t1_meth.c
diff --git a/jni/openssl/ssl/t1_reneg.c b/jni/libopenssl/ssl/t1_reneg.c
similarity index 100%
rename from jni/openssl/ssl/t1_reneg.c
rename to jni/libopenssl/ssl/t1_reneg.c
diff --git a/jni/openssl/ssl/t1_srvr.c b/jni/libopenssl/ssl/t1_srvr.c
similarity index 100%
rename from jni/openssl/ssl/t1_srvr.c
rename to jni/libopenssl/ssl/t1_srvr.c
diff --git a/jni/openssl/ssl/tls1.h b/jni/libopenssl/ssl/tls1.h
similarity index 100%
rename from jni/openssl/ssl/tls1.h
rename to jni/libopenssl/ssl/tls1.h
diff --git a/jni/libopus/Android.mk b/jni/libopus/Android.mk
new file mode 100644
index 0000000..aaa2f19
--- /dev/null
+++ b/jni/libopus/Android.mk
@@ -0,0 +1,196 @@
+include $(CLEAR_VARS)
+
+MY_OPUS = libopus/sources
+
+LOCAL_CELT_SOURCES := 	$(MY_OPUS)/celt/bands.c \
+						$(MY_OPUS)/celt/celt_lpc.c \
+						$(MY_OPUS)/celt/rate.c \
+						$(MY_OPUS)/celt/entenc.c \
+						$(MY_OPUS)/celt/modes.c \
+						$(MY_OPUS)/celt/mdct.c \
+						$(MY_OPUS)/celt/entcode.c \
+						$(MY_OPUS)/celt/celt.c \
+						$(MY_OPUS)/celt/laplace.c \
+						$(MY_OPUS)/celt/cwrs.c \
+						$(MY_OPUS)/celt/quant_bands.c \
+						$(MY_OPUS)/celt/opus_custom_demo.c \
+						$(MY_OPUS)/celt/pitch.c \
+						$(MY_OPUS)/celt/entdec.c \
+						$(MY_OPUS)/celt/kiss_fft.c \
+						$(MY_OPUS)/celt/mathops.c \
+						$(MY_OPUS)/celt/vq.c
+    
+
+LOCAL_SILK_SOURCES :=  	$(MY_OPUS)/silk/CNG.c \
+						$(MY_OPUS)/silk/VQ_WMat_EC.c \
+						$(MY_OPUS)/silk/tables_pulses_per_block.c \
+						$(MY_OPUS)/silk/check_control_input.c \
+						$(MY_OPUS)/silk/NLSF_encode.c \
+						$(MY_OPUS)/silk/gain_quant.c \
+						$(MY_OPUS)/silk/stereo_MS_to_LR.c \
+						$(MY_OPUS)/silk/control_SNR.c \
+						$(MY_OPUS)/silk/stereo_decode_pred.c \
+						$(MY_OPUS)/silk/init_encoder.c \
+						$(MY_OPUS)/silk/bwexpander_32.c \
+						$(MY_OPUS)/silk/ana_filt_bank_1.c \
+						$(MY_OPUS)/silk/control_codec.c \
+						$(MY_OPUS)/silk/stereo_encode_pred.c \
+						$(MY_OPUS)/silk/shell_coder.c \
+						$(MY_OPUS)/silk/PLC.c \
+						$(MY_OPUS)/silk/encode_pulses.c \
+						$(MY_OPUS)/silk/resampler_rom.c \
+						$(MY_OPUS)/silk/stereo_quant_pred.c \
+						$(MY_OPUS)/silk/CNG.c \
+						$(MY_OPUS)/silk/biquad_alt.c \
+						$(MY_OPUS)/silk/resampler_down2_3.c \
+						$(MY_OPUS)/silk/VAD.c \
+						$(MY_OPUS)/silk/LPC_analysis_filter.c \
+						$(MY_OPUS)/silk/NSQ_del_dec.c \
+						$(MY_OPUS)/silk/NLSF_stabilize.c \
+						$(MY_OPUS)/silk/tables_pitch_lag.c \
+						$(MY_OPUS)/silk/decode_indices.c \
+						$(MY_OPUS)/silk/NLSF_del_dec_quant.c \
+						$(MY_OPUS)/silk/A2NLSF.c \
+						$(MY_OPUS)/silk/resampler.c \
+						$(MY_OPUS)/silk/decode_frame.c \
+						$(MY_OPUS)/silk/tables_other.c \
+						$(MY_OPUS)/silk/tables_NLSF_CB_NB_MB.c \
+						$(MY_OPUS)/silk/decode_pitch.c \
+						$(MY_OPUS)/silk/resampler_down2.c \
+						$(MY_OPUS)/silk/encode_indices.c \
+						$(MY_OPUS)/silk/decode_parameters.c \
+						$(MY_OPUS)/silk/resampler_private_AR2.c \
+						$(MY_OPUS)/silk/init_decoder.c \
+						$(MY_OPUS)/silk/quant_LTP_gains.c \
+						$(MY_OPUS)/silk/decode_core.c \
+						$(MY_OPUS)/silk/enc_API.c \
+						$(MY_OPUS)/silk/code_signs.c \
+						$(MY_OPUS)/silk/lin2log.c \
+						$(MY_OPUS)/silk/control_audio_bandwidth.c \
+						$(MY_OPUS)/silk/NLSF2A.c \
+						$(MY_OPUS)/silk/NSQ.c \
+						$(MY_OPUS)/silk/tables_gain.c \
+						$(MY_OPUS)/silk/dec_API.c \
+						$(MY_OPUS)/silk/table_LSF_cos.c \
+						$(MY_OPUS)/silk/resampler_private_down_FIR.c \
+						$(MY_OPUS)/silk/NLSF_decode.c \
+						$(MY_OPUS)/silk/sum_sqr_shift.c \
+						$(MY_OPUS)/silk/interpolate.c \
+						$(MY_OPUS)/silk/bwexpander.c \
+						$(MY_OPUS)/silk/sigm_Q15.c \
+						$(MY_OPUS)/silk/LPC_inv_pred_gain.c \
+						$(MY_OPUS)/silk/NLSF_unpack.c \
+						$(MY_OPUS)/silk/tables_LTP.c \
+						$(MY_OPUS)/silk/decode_pulses.c \
+						$(MY_OPUS)/silk/inner_prod_aligned.c \
+						$(MY_OPUS)/silk/LP_variable_cutoff.c \
+						$(MY_OPUS)/silk/debug.c \
+						$(MY_OPUS)/silk/stereo_LR_to_MS.c \
+						$(MY_OPUS)/silk/stereo_find_predictor.c \
+						$(MY_OPUS)/silk/process_NLSFs.c \
+						$(MY_OPUS)/silk/tables_NLSF_CB_WB.c \
+						$(MY_OPUS)/silk/NLSF_VQ.c \
+						$(MY_OPUS)/silk/log2lin.c \
+						$(MY_OPUS)/silk/decoder_set_fs.c \
+						$(MY_OPUS)/silk/sort.c \
+						$(MY_OPUS)/silk/HP_variable_cutoff.c \
+						$(MY_OPUS)/silk/NLSF_VQ_weights_laroia.c \
+						$(MY_OPUS)/silk/resampler_private_up2_HQ.c \
+						$(MY_OPUS)/silk/pitch_est_tables.c \
+						$(MY_OPUS)/silk/resampler_private_IIR_FIR.c
+
+
+
+
+LOCAL_SILK_SOURCES_FIXED := $(MY_OPUS)/silk/fixed/LTP_analysis_filter_FIX.c \
+							$(MY_OPUS)/silk/fixed/find_pitch_lags_FIX.c \
+							$(MY_OPUS)/silk/fixed/solve_LS_FIX.c \
+							$(MY_OPUS)/silk/fixed/k2a_FIX.c \
+							$(MY_OPUS)/silk/fixed/regularize_correlations_FIX.c \
+							$(MY_OPUS)/silk/fixed/apply_sine_window_FIX.c \
+							$(MY_OPUS)/silk/fixed/corrMatrix_FIX.c \
+							$(MY_OPUS)/silk/fixed/process_gains_FIX.c \
+							$(MY_OPUS)/silk/fixed/prefilter_FIX.c \
+							$(MY_OPUS)/silk/fixed/autocorr_FIX.c \
+							$(MY_OPUS)/silk/fixed/find_LTP_FIX.c \
+							$(MY_OPUS)/silk/fixed/warped_autocorrelation_FIX.c \
+							$(MY_OPUS)/silk/fixed/schur_FIX.c \
+							$(MY_OPUS)/silk/fixed/burg_modified_FIX.c \
+							$(MY_OPUS)/silk/fixed/noise_shape_analysis_FIX.c \
+							$(MY_OPUS)/silk/fixed/residual_energy_FIX.c \
+							$(MY_OPUS)/silk/fixed/find_LPC_FIX.c \
+							$(MY_OPUS)/silk/fixed/encode_frame_FIX.c \
+							$(MY_OPUS)/silk/fixed/k2a_Q16_FIX.c \
+							$(MY_OPUS)/silk/fixed/LTP_analysis_filter_FIX.c \
+							$(MY_OPUS)/silk/fixed/find_pred_coefs_FIX.c \
+							$(MY_OPUS)/silk/fixed/schur64_FIX.c \
+							$(MY_OPUS)/silk/fixed/pitch_analysis_core_FIX.c \
+							$(MY_OPUS)/silk/fixed/vector_ops_FIX.c \
+							$(MY_OPUS)/silk/fixed/residual_energy16_FIX.c \
+							$(MY_OPUS)/silk/fixed/LTP_scale_ctrl_FIX.c \
+
+
+
+LOCAL_SILK_SOURCES_FLOAT := $(MY_OPUS)/silk/float/apply_sine_window_FLP.c \
+							$(MY_OPUS)/silk/float/inner_product_FLP.c \
+							$(MY_OPUS)/silk/float/warped_autocorrelation_FLP.c \
+							$(MY_OPUS)/silk/float/autocorrelation_FLP.c \
+							$(MY_OPUS)/silk/float/find_pred_coefs_FLP.c \
+							$(MY_OPUS)/silk/float/LPC_analysis_filter_FLP.c \
+							$(MY_OPUS)/silk/float/find_LPC_FLP.c \
+							$(MY_OPUS)/silk/float/scale_copy_vector_FLP.c \
+							$(MY_OPUS)/silk/float/wrappers_FLP.c \
+							$(MY_OPUS)/silk/float/process_gains_FLP.c \
+							$(MY_OPUS)/silk/float/burg_modified_FLP.c \
+							$(MY_OPUS)/silk/float/k2a_FLP.c \
+							$(MY_OPUS)/silk/float/prefilter_FLP.c \
+							$(MY_OPUS)/silk/float/corrMatrix_FLP.c \
+							$(MY_OPUS)/silk/float/LPC_inv_pred_gain_FLP.c \
+							$(MY_OPUS)/silk/float/LTP_scale_ctrl_FLP.c \
+							$(MY_OPUS)/silk/float/pitch_analysis_core_FLP.c \
+							$(MY_OPUS)/silk/float/solve_LS_FLP.c \
+							$(MY_OPUS)/silk/float/energy_FLP.c \
+							$(MY_OPUS)/silk/float/find_pitch_lags_FLP.c \
+							$(MY_OPUS)/silk/float/LTP_analysis_filter_FLP.c \
+							$(MY_OPUS)/silk/float/residual_energy_FLP.c \
+							$(MY_OPUS)/silk/float/regularize_correlations_FLP.c \
+							$(MY_OPUS)/silk/float/bwexpander_FLP.c \
+							$(MY_OPUS)/silk/float/noise_shape_analysis_FLP.c \
+							$(MY_OPUS)/silk/float/encode_frame_FLP.c \
+							$(MY_OPUS)/silk/float/scale_vector_FLP.c \
+							$(MY_OPUS)/silk/float/sort_FLP.c \
+							$(MY_OPUS)/silk/float/find_LTP_FLP.c \
+							$(MY_OPUS)/silk/float/levinsondurbin_FLP.c \
+							$(MY_OPUS)/silk/float/schur_FLP.c \
+
+LOCAL_OPUS_SOURCES := 	$(MY_OPUS)/src/opus.c \
+						$(MY_OPUS)/src/repacketizer_demo.c \
+						$(MY_OPUS)/src/opus_decoder.c \
+						$(MY_OPUS)/src/repacketizer.c \
+						$(MY_OPUS)/src/opus_demo.c \
+						$(MY_OPUS)/src/opus_multistream.c \
+						$(MY_OPUS)/src/opus_encoder.c \
+						$(MY_OPUS)/src/opus_compare.c \
+
+LOCAL_CFLAGS := -DNONTHREADSAFE_PSEUDOSTACK -DOPUS_BUILD
+
+LOCAL_C_INCLUDES := $(MY_OPUS) \
+					$(MY_OPUS)/include \
+					$(MY_OPUS)/celt \
+					$(MY_OPUS)/silk \
+					$(MY_OPUS)/silk/fixed \
+					$(MY_OPUS)/silk/float
+
+LOCAL_SRC_FILES := 	$(LOCAL_OPUS_SOURCES) \
+					$(LOCAL_CELT_SOURCES) \
+					$(LOCAL_SILK_SOURCES) \
+					$(LOCAL_SILK_SOURCES_FIXED) \
+					$(LOCAL_SILK_SOURCES_FLOAT)
+
+LOCAL_EXPORT_C_INCLUDES := $(MY_OPUS)/include
+
+LOCAL_MODULE := libopus
+
+LOCAL_LDLIBS := -llog 
+				
+include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libopus/AUTHORS b/jni/libopus/sources/AUTHORS
similarity index 100%
rename from jni/libopus/AUTHORS
rename to jni/libopus/sources/AUTHORS
diff --git a/jni/libopus/COPYING b/jni/libopus/sources/COPYING
similarity index 100%
rename from jni/libopus/COPYING
rename to jni/libopus/sources/COPYING
diff --git a/jni/libopus/ChangeLog b/jni/libopus/sources/ChangeLog
similarity index 100%
rename from jni/libopus/ChangeLog
rename to jni/libopus/sources/ChangeLog
diff --git a/jni/libopus/INSTALL b/jni/libopus/sources/INSTALL
similarity index 100%
rename from jni/libopus/INSTALL
rename to jni/libopus/sources/INSTALL
diff --git a/jni/libopus/Makefile b/jni/libopus/sources/Makefile
similarity index 100%
rename from jni/libopus/Makefile
rename to jni/libopus/sources/Makefile
diff --git a/jni/libopus/Makefile.am b/jni/libopus/sources/Makefile.am
similarity index 100%
rename from jni/libopus/Makefile.am
rename to jni/libopus/sources/Makefile.am
diff --git a/jni/libopus/Makefile.in b/jni/libopus/sources/Makefile.in
similarity index 100%
rename from jni/libopus/Makefile.in
rename to jni/libopus/sources/Makefile.in
diff --git a/jni/libopus/Makefile.unix b/jni/libopus/sources/Makefile.unix
similarity index 100%
rename from jni/libopus/Makefile.unix
rename to jni/libopus/sources/Makefile.unix
diff --git a/jni/libopus/NEWS b/jni/libopus/sources/NEWS
similarity index 100%
rename from jni/libopus/NEWS
rename to jni/libopus/sources/NEWS
diff --git a/jni/libopus/README b/jni/libopus/sources/README
similarity index 100%
rename from jni/libopus/README
rename to jni/libopus/sources/README
diff --git a/jni/libopus/aclocal.m4 b/jni/libopus/sources/aclocal.m4
similarity index 100%
rename from jni/libopus/aclocal.m4
rename to jni/libopus/sources/aclocal.m4
diff --git a/jni/libopus/celt/.deps/.dirstamp b/jni/libopus/sources/celt/.deps/.dirstamp
similarity index 100%
rename from jni/libopus/celt/.deps/.dirstamp
rename to jni/libopus/sources/celt/.deps/.dirstamp
diff --git a/jni/libopus/celt/.deps/bands.Plo b/jni/libopus/sources/celt/.deps/bands.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/bands.Plo
rename to jni/libopus/sources/celt/.deps/bands.Plo
diff --git a/jni/libopus/celt/.deps/celt.Plo b/jni/libopus/sources/celt/.deps/celt.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/celt.Plo
rename to jni/libopus/sources/celt/.deps/celt.Plo
diff --git a/jni/libopus/celt/.deps/celt_lpc.Plo b/jni/libopus/sources/celt/.deps/celt_lpc.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/celt_lpc.Plo
rename to jni/libopus/sources/celt/.deps/celt_lpc.Plo
diff --git a/jni/libopus/celt/.deps/cwrs.Plo b/jni/libopus/sources/celt/.deps/cwrs.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/cwrs.Plo
rename to jni/libopus/sources/celt/.deps/cwrs.Plo
diff --git a/jni/libopus/celt/.deps/entcode.Plo b/jni/libopus/sources/celt/.deps/entcode.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/entcode.Plo
rename to jni/libopus/sources/celt/.deps/entcode.Plo
diff --git a/jni/libopus/celt/.deps/entdec.Plo b/jni/libopus/sources/celt/.deps/entdec.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/entdec.Plo
rename to jni/libopus/sources/celt/.deps/entdec.Plo
diff --git a/jni/libopus/celt/.deps/entenc.Plo b/jni/libopus/sources/celt/.deps/entenc.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/entenc.Plo
rename to jni/libopus/sources/celt/.deps/entenc.Plo
diff --git a/jni/libopus/celt/.deps/kiss_fft.Plo b/jni/libopus/sources/celt/.deps/kiss_fft.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/kiss_fft.Plo
rename to jni/libopus/sources/celt/.deps/kiss_fft.Plo
diff --git a/jni/libopus/celt/.deps/laplace.Plo b/jni/libopus/sources/celt/.deps/laplace.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/laplace.Plo
rename to jni/libopus/sources/celt/.deps/laplace.Plo
diff --git a/jni/libopus/celt/.deps/mathops.Plo b/jni/libopus/sources/celt/.deps/mathops.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/mathops.Plo
rename to jni/libopus/sources/celt/.deps/mathops.Plo
diff --git a/jni/libopus/celt/.deps/mdct.Plo b/jni/libopus/sources/celt/.deps/mdct.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/mdct.Plo
rename to jni/libopus/sources/celt/.deps/mdct.Plo
diff --git a/jni/libopus/celt/.deps/modes.Plo b/jni/libopus/sources/celt/.deps/modes.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/modes.Plo
rename to jni/libopus/sources/celt/.deps/modes.Plo
diff --git a/jni/libopus/celt/.deps/opus_custom_demo.Po b/jni/libopus/sources/celt/.deps/opus_custom_demo.Po
similarity index 100%
rename from jni/libopus/celt/.deps/opus_custom_demo.Po
rename to jni/libopus/sources/celt/.deps/opus_custom_demo.Po
diff --git a/jni/libopus/celt/.deps/pitch.Plo b/jni/libopus/sources/celt/.deps/pitch.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/pitch.Plo
rename to jni/libopus/sources/celt/.deps/pitch.Plo
diff --git a/jni/libopus/celt/.deps/quant_bands.Plo b/jni/libopus/sources/celt/.deps/quant_bands.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/quant_bands.Plo
rename to jni/libopus/sources/celt/.deps/quant_bands.Plo
diff --git a/jni/libopus/celt/.deps/rate.Plo b/jni/libopus/sources/celt/.deps/rate.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/rate.Plo
rename to jni/libopus/sources/celt/.deps/rate.Plo
diff --git a/jni/libopus/celt/.deps/vq.Plo b/jni/libopus/sources/celt/.deps/vq.Plo
similarity index 100%
rename from jni/libopus/celt/.deps/vq.Plo
rename to jni/libopus/sources/celt/.deps/vq.Plo
diff --git a/jni/libopus/celt/.dirstamp b/jni/libopus/sources/celt/.dirstamp
similarity index 100%
rename from jni/libopus/celt/.dirstamp
rename to jni/libopus/sources/celt/.dirstamp
diff --git a/jni/libopus/celt/_kiss_fft_guts.h b/jni/libopus/sources/celt/_kiss_fft_guts.h
similarity index 100%
rename from jni/libopus/celt/_kiss_fft_guts.h
rename to jni/libopus/sources/celt/_kiss_fft_guts.h
diff --git a/jni/libopus/celt/arch.h b/jni/libopus/sources/celt/arch.h
similarity index 100%
rename from jni/libopus/celt/arch.h
rename to jni/libopus/sources/celt/arch.h
diff --git a/jni/libopus/celt/bands.c b/jni/libopus/sources/celt/bands.c
similarity index 100%
rename from jni/libopus/celt/bands.c
rename to jni/libopus/sources/celt/bands.c
diff --git a/jni/libopus/celt/bands.h b/jni/libopus/sources/celt/bands.h
similarity index 100%
rename from jni/libopus/celt/bands.h
rename to jni/libopus/sources/celt/bands.h
diff --git a/jni/libopus/celt/celt.c b/jni/libopus/sources/celt/celt.c
similarity index 100%
rename from jni/libopus/celt/celt.c
rename to jni/libopus/sources/celt/celt.c
diff --git a/jni/libopus/celt/celt.h b/jni/libopus/sources/celt/celt.h
similarity index 100%
rename from jni/libopus/celt/celt.h
rename to jni/libopus/sources/celt/celt.h
diff --git a/jni/libopus/celt/celt.vcxproj b/jni/libopus/sources/celt/celt.vcxproj
similarity index 100%
rename from jni/libopus/celt/celt.vcxproj
rename to jni/libopus/sources/celt/celt.vcxproj
diff --git a/jni/libopus/celt/celt.vcxproj.filters b/jni/libopus/sources/celt/celt.vcxproj.filters
similarity index 100%
rename from jni/libopus/celt/celt.vcxproj.filters
rename to jni/libopus/sources/celt/celt.vcxproj.filters
diff --git a/jni/libopus/celt/celt_lpc.c b/jni/libopus/sources/celt/celt_lpc.c
similarity index 100%
rename from jni/libopus/celt/celt_lpc.c
rename to jni/libopus/sources/celt/celt_lpc.c
diff --git a/jni/libopus/celt/celt_lpc.h b/jni/libopus/sources/celt/celt_lpc.h
similarity index 100%
rename from jni/libopus/celt/celt_lpc.h
rename to jni/libopus/sources/celt/celt_lpc.h
diff --git a/jni/libopus/celt/cwrs.c b/jni/libopus/sources/celt/cwrs.c
similarity index 100%
rename from jni/libopus/celt/cwrs.c
rename to jni/libopus/sources/celt/cwrs.c
diff --git a/jni/libopus/celt/cwrs.h b/jni/libopus/sources/celt/cwrs.h
similarity index 100%
rename from jni/libopus/celt/cwrs.h
rename to jni/libopus/sources/celt/cwrs.h
diff --git a/jni/libopus/celt/ecintrin.h b/jni/libopus/sources/celt/ecintrin.h
similarity index 100%
rename from jni/libopus/celt/ecintrin.h
rename to jni/libopus/sources/celt/ecintrin.h
diff --git a/jni/libopus/celt/entcode.c b/jni/libopus/sources/celt/entcode.c
similarity index 100%
rename from jni/libopus/celt/entcode.c
rename to jni/libopus/sources/celt/entcode.c
diff --git a/jni/libopus/celt/entcode.h b/jni/libopus/sources/celt/entcode.h
similarity index 100%
rename from jni/libopus/celt/entcode.h
rename to jni/libopus/sources/celt/entcode.h
diff --git a/jni/libopus/celt/entdec.c b/jni/libopus/sources/celt/entdec.c
similarity index 100%
rename from jni/libopus/celt/entdec.c
rename to jni/libopus/sources/celt/entdec.c
diff --git a/jni/libopus/celt/entdec.h b/jni/libopus/sources/celt/entdec.h
similarity index 100%
rename from jni/libopus/celt/entdec.h
rename to jni/libopus/sources/celt/entdec.h
diff --git a/jni/libopus/celt/entenc.c b/jni/libopus/sources/celt/entenc.c
similarity index 100%
rename from jni/libopus/celt/entenc.c
rename to jni/libopus/sources/celt/entenc.c
diff --git a/jni/libopus/celt/entenc.h b/jni/libopus/sources/celt/entenc.h
similarity index 100%
rename from jni/libopus/celt/entenc.h
rename to jni/libopus/sources/celt/entenc.h
diff --git a/jni/libopus/celt/fixed_debug.h b/jni/libopus/sources/celt/fixed_debug.h
similarity index 100%
rename from jni/libopus/celt/fixed_debug.h
rename to jni/libopus/sources/celt/fixed_debug.h
diff --git a/jni/libopus/celt/fixed_generic.h b/jni/libopus/sources/celt/fixed_generic.h
similarity index 100%
rename from jni/libopus/celt/fixed_generic.h
rename to jni/libopus/sources/celt/fixed_generic.h
diff --git a/jni/libopus/celt/float_cast.h b/jni/libopus/sources/celt/float_cast.h
similarity index 100%
rename from jni/libopus/celt/float_cast.h
rename to jni/libopus/sources/celt/float_cast.h
diff --git a/jni/libopus/celt/kiss_fft.c b/jni/libopus/sources/celt/kiss_fft.c
similarity index 100%
rename from jni/libopus/celt/kiss_fft.c
rename to jni/libopus/sources/celt/kiss_fft.c
diff --git a/jni/libopus/celt/kiss_fft.h b/jni/libopus/sources/celt/kiss_fft.h
similarity index 100%
rename from jni/libopus/celt/kiss_fft.h
rename to jni/libopus/sources/celt/kiss_fft.h
diff --git a/jni/libopus/celt/laplace.c b/jni/libopus/sources/celt/laplace.c
similarity index 100%
rename from jni/libopus/celt/laplace.c
rename to jni/libopus/sources/celt/laplace.c
diff --git a/jni/libopus/celt/laplace.h b/jni/libopus/sources/celt/laplace.h
similarity index 100%
rename from jni/libopus/celt/laplace.h
rename to jni/libopus/sources/celt/laplace.h
diff --git a/jni/libopus/celt/mathops.c b/jni/libopus/sources/celt/mathops.c
similarity index 100%
rename from jni/libopus/celt/mathops.c
rename to jni/libopus/sources/celt/mathops.c
diff --git a/jni/libopus/celt/mathops.h b/jni/libopus/sources/celt/mathops.h
similarity index 100%
rename from jni/libopus/celt/mathops.h
rename to jni/libopus/sources/celt/mathops.h
diff --git a/jni/libopus/celt/mdct.c b/jni/libopus/sources/celt/mdct.c
similarity index 100%
rename from jni/libopus/celt/mdct.c
rename to jni/libopus/sources/celt/mdct.c
diff --git a/jni/libopus/celt/mdct.h b/jni/libopus/sources/celt/mdct.h
similarity index 100%
rename from jni/libopus/celt/mdct.h
rename to jni/libopus/sources/celt/mdct.h
diff --git a/jni/libopus/celt/mfrngcod.h b/jni/libopus/sources/celt/mfrngcod.h
similarity index 100%
rename from jni/libopus/celt/mfrngcod.h
rename to jni/libopus/sources/celt/mfrngcod.h
diff --git a/jni/libopus/celt/modes.c b/jni/libopus/sources/celt/modes.c
similarity index 100%
rename from jni/libopus/celt/modes.c
rename to jni/libopus/sources/celt/modes.c
diff --git a/jni/libopus/celt/modes.h b/jni/libopus/sources/celt/modes.h
similarity index 100%
rename from jni/libopus/celt/modes.h
rename to jni/libopus/sources/celt/modes.h
diff --git a/jni/libopus/celt/opus_custom_demo.c b/jni/libopus/sources/celt/opus_custom_demo.c
similarity index 100%
rename from jni/libopus/celt/opus_custom_demo.c
rename to jni/libopus/sources/celt/opus_custom_demo.c
diff --git a/jni/libopus/celt/os_support.h b/jni/libopus/sources/celt/os_support.h
similarity index 100%
rename from jni/libopus/celt/os_support.h
rename to jni/libopus/sources/celt/os_support.h
diff --git a/jni/libopus/celt/pitch.c b/jni/libopus/sources/celt/pitch.c
similarity index 100%
rename from jni/libopus/celt/pitch.c
rename to jni/libopus/sources/celt/pitch.c
diff --git a/jni/libopus/celt/pitch.h b/jni/libopus/sources/celt/pitch.h
similarity index 100%
rename from jni/libopus/celt/pitch.h
rename to jni/libopus/sources/celt/pitch.h
diff --git a/jni/libopus/celt/quant_bands.c b/jni/libopus/sources/celt/quant_bands.c
similarity index 100%
rename from jni/libopus/celt/quant_bands.c
rename to jni/libopus/sources/celt/quant_bands.c
diff --git a/jni/libopus/celt/quant_bands.h b/jni/libopus/sources/celt/quant_bands.h
similarity index 100%
rename from jni/libopus/celt/quant_bands.h
rename to jni/libopus/sources/celt/quant_bands.h
diff --git a/jni/libopus/celt/rate.c b/jni/libopus/sources/celt/rate.c
similarity index 100%
rename from jni/libopus/celt/rate.c
rename to jni/libopus/sources/celt/rate.c
diff --git a/jni/libopus/celt/rate.h b/jni/libopus/sources/celt/rate.h
similarity index 100%
rename from jni/libopus/celt/rate.h
rename to jni/libopus/sources/celt/rate.h
diff --git a/jni/libopus/celt/stack_alloc.h b/jni/libopus/sources/celt/stack_alloc.h
similarity index 100%
rename from jni/libopus/celt/stack_alloc.h
rename to jni/libopus/sources/celt/stack_alloc.h
diff --git a/jni/libopus/celt/static_modes_fixed.h b/jni/libopus/sources/celt/static_modes_fixed.h
similarity index 100%
rename from jni/libopus/celt/static_modes_fixed.h
rename to jni/libopus/sources/celt/static_modes_fixed.h
diff --git a/jni/libopus/celt/static_modes_float.h b/jni/libopus/sources/celt/static_modes_float.h
similarity index 100%
rename from jni/libopus/celt/static_modes_float.h
rename to jni/libopus/sources/celt/static_modes_float.h
diff --git a/jni/libopus/celt/tests/.deps/.dirstamp b/jni/libopus/sources/celt/tests/.deps/.dirstamp
similarity index 100%
rename from jni/libopus/celt/tests/.deps/.dirstamp
rename to jni/libopus/sources/celt/tests/.deps/.dirstamp
diff --git a/jni/libopus/celt/tests/.deps/test_unit_cwrs32.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_cwrs32.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_cwrs32.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_cwrs32.Po
diff --git a/jni/libopus/celt/tests/.deps/test_unit_dft.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_dft.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_dft.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_dft.Po
diff --git a/jni/libopus/celt/tests/.deps/test_unit_entropy.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_entropy.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_entropy.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_entropy.Po
diff --git a/jni/libopus/celt/tests/.deps/test_unit_laplace.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_laplace.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_laplace.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_laplace.Po
diff --git a/jni/libopus/celt/tests/.deps/test_unit_mathops.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_mathops.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_mathops.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_mathops.Po
diff --git a/jni/libopus/celt/tests/.deps/test_unit_mdct.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_mdct.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_mdct.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_mdct.Po
diff --git a/jni/libopus/celt/tests/.deps/test_unit_rotation.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_rotation.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_rotation.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_rotation.Po
diff --git a/jni/libopus/celt/tests/.deps/test_unit_types.Po b/jni/libopus/sources/celt/tests/.deps/test_unit_types.Po
similarity index 100%
rename from jni/libopus/celt/tests/.deps/test_unit_types.Po
rename to jni/libopus/sources/celt/tests/.deps/test_unit_types.Po
diff --git a/jni/libopus/celt/tests/.dirstamp b/jni/libopus/sources/celt/tests/.dirstamp
similarity index 100%
rename from jni/libopus/celt/tests/.dirstamp
rename to jni/libopus/sources/celt/tests/.dirstamp
diff --git a/jni/libopus/celt/tests/test_unit_cwrs32.c b/jni/libopus/sources/celt/tests/test_unit_cwrs32.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_cwrs32.c
rename to jni/libopus/sources/celt/tests/test_unit_cwrs32.c
diff --git a/jni/libopus/celt/tests/test_unit_dft.c b/jni/libopus/sources/celt/tests/test_unit_dft.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_dft.c
rename to jni/libopus/sources/celt/tests/test_unit_dft.c
diff --git a/jni/libopus/celt/tests/test_unit_entropy.c b/jni/libopus/sources/celt/tests/test_unit_entropy.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_entropy.c
rename to jni/libopus/sources/celt/tests/test_unit_entropy.c
diff --git a/jni/libopus/celt/tests/test_unit_laplace.c b/jni/libopus/sources/celt/tests/test_unit_laplace.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_laplace.c
rename to jni/libopus/sources/celt/tests/test_unit_laplace.c
diff --git a/jni/libopus/celt/tests/test_unit_mathops.c b/jni/libopus/sources/celt/tests/test_unit_mathops.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_mathops.c
rename to jni/libopus/sources/celt/tests/test_unit_mathops.c
diff --git a/jni/libopus/celt/tests/test_unit_mdct.c b/jni/libopus/sources/celt/tests/test_unit_mdct.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_mdct.c
rename to jni/libopus/sources/celt/tests/test_unit_mdct.c
diff --git a/jni/libopus/celt/tests/test_unit_rotation.c b/jni/libopus/sources/celt/tests/test_unit_rotation.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_rotation.c
rename to jni/libopus/sources/celt/tests/test_unit_rotation.c
diff --git a/jni/libopus/celt/tests/test_unit_types.c b/jni/libopus/sources/celt/tests/test_unit_types.c
similarity index 100%
rename from jni/libopus/celt/tests/test_unit_types.c
rename to jni/libopus/sources/celt/tests/test_unit_types.c
diff --git a/jni/libopus/celt/vq.c b/jni/libopus/sources/celt/vq.c
similarity index 100%
rename from jni/libopus/celt/vq.c
rename to jni/libopus/sources/celt/vq.c
diff --git a/jni/libopus/celt/vq.h b/jni/libopus/sources/celt/vq.h
similarity index 100%
rename from jni/libopus/celt/vq.h
rename to jni/libopus/sources/celt/vq.h
diff --git a/jni/libopus/celt_headers.mk b/jni/libopus/sources/celt_headers.mk
similarity index 100%
rename from jni/libopus/celt_headers.mk
rename to jni/libopus/sources/celt_headers.mk
diff --git a/jni/libopus/celt_sources.mk b/jni/libopus/sources/celt_sources.mk
similarity index 100%
rename from jni/libopus/celt_sources.mk
rename to jni/libopus/sources/celt_sources.mk
diff --git a/jni/libopus/compile b/jni/libopus/sources/compile
similarity index 100%
rename from jni/libopus/compile
rename to jni/libopus/sources/compile
diff --git a/jni/libopus/config.guess b/jni/libopus/sources/config.guess
similarity index 100%
rename from jni/libopus/config.guess
rename to jni/libopus/sources/config.guess
diff --git a/jni/libopus/config.h b/jni/libopus/sources/config.h
similarity index 100%
rename from jni/libopus/config.h
rename to jni/libopus/sources/config.h
diff --git a/jni/libopus/config.h.in b/jni/libopus/sources/config.h.in
similarity index 100%
rename from jni/libopus/config.h.in
rename to jni/libopus/sources/config.h.in
diff --git a/jni/libopus/config.log b/jni/libopus/sources/config.log
similarity index 100%
rename from jni/libopus/config.log
rename to jni/libopus/sources/config.log
diff --git a/jni/libopus/config.status b/jni/libopus/sources/config.status
similarity index 100%
rename from jni/libopus/config.status
rename to jni/libopus/sources/config.status
diff --git a/jni/libopus/config.sub b/jni/libopus/sources/config.sub
similarity index 100%
rename from jni/libopus/config.sub
rename to jni/libopus/sources/config.sub
diff --git a/jni/libopus/configure b/jni/libopus/sources/configure
similarity index 100%
rename from jni/libopus/configure
rename to jni/libopus/sources/configure
diff --git a/jni/libopus/configure.ac b/jni/libopus/sources/configure.ac
similarity index 100%
rename from jni/libopus/configure.ac
rename to jni/libopus/sources/configure.ac
diff --git a/jni/libopus/depcomp b/jni/libopus/sources/depcomp
similarity index 100%
rename from jni/libopus/depcomp
rename to jni/libopus/sources/depcomp
diff --git a/jni/libopus/doc/Doxyfile b/jni/libopus/sources/doc/Doxyfile
similarity index 100%
rename from jni/libopus/doc/Doxyfile
rename to jni/libopus/sources/doc/Doxyfile
diff --git a/jni/libopus/doc/Doxyfile.in b/jni/libopus/sources/doc/Doxyfile.in
similarity index 100%
rename from jni/libopus/doc/Doxyfile.in
rename to jni/libopus/sources/doc/Doxyfile.in
diff --git a/jni/libopus/doc/Makefile b/jni/libopus/sources/doc/Makefile
similarity index 100%
rename from jni/libopus/doc/Makefile
rename to jni/libopus/sources/doc/Makefile
diff --git a/jni/libopus/doc/Makefile.am b/jni/libopus/sources/doc/Makefile.am
similarity index 100%
rename from jni/libopus/doc/Makefile.am
rename to jni/libopus/sources/doc/Makefile.am
diff --git a/jni/libopus/doc/Makefile.in b/jni/libopus/sources/doc/Makefile.in
similarity index 100%
rename from jni/libopus/doc/Makefile.in
rename to jni/libopus/sources/doc/Makefile.in
diff --git a/jni/libopus/doc/customdoxygen.css b/jni/libopus/sources/doc/customdoxygen.css
similarity index 100%
rename from jni/libopus/doc/customdoxygen.css
rename to jni/libopus/sources/doc/customdoxygen.css
diff --git a/jni/libopus/doc/footer.html b/jni/libopus/sources/doc/footer.html
similarity index 100%
rename from jni/libopus/doc/footer.html
rename to jni/libopus/sources/doc/footer.html
diff --git a/jni/libopus/doc/header.html b/jni/libopus/sources/doc/header.html
similarity index 100%
rename from jni/libopus/doc/header.html
rename to jni/libopus/sources/doc/header.html
diff --git a/jni/libopus/doc/opus_logo.svg b/jni/libopus/sources/doc/opus_logo.svg
similarity index 100%
rename from jni/libopus/doc/opus_logo.svg
rename to jni/libopus/sources/doc/opus_logo.svg
diff --git a/jni/libopus/include/opus.h b/jni/libopus/sources/include/opus.h
similarity index 100%
rename from jni/libopus/include/opus.h
rename to jni/libopus/sources/include/opus.h
diff --git a/jni/libopus/include/opus_custom.h b/jni/libopus/sources/include/opus_custom.h
similarity index 100%
rename from jni/libopus/include/opus_custom.h
rename to jni/libopus/sources/include/opus_custom.h
diff --git a/jni/libopus/include/opus_defines.h b/jni/libopus/sources/include/opus_defines.h
similarity index 100%
rename from jni/libopus/include/opus_defines.h
rename to jni/libopus/sources/include/opus_defines.h
diff --git a/jni/libopus/include/opus_multistream.h b/jni/libopus/sources/include/opus_multistream.h
similarity index 100%
rename from jni/libopus/include/opus_multistream.h
rename to jni/libopus/sources/include/opus_multistream.h
diff --git a/jni/libopus/include/opus_types.h b/jni/libopus/sources/include/opus_types.h
similarity index 100%
rename from jni/libopus/include/opus_types.h
rename to jni/libopus/sources/include/opus_types.h
diff --git a/jni/libopus/install-sh b/jni/libopus/sources/install-sh
similarity index 100%
rename from jni/libopus/install-sh
rename to jni/libopus/sources/install-sh
diff --git a/jni/libopus/libtool b/jni/libopus/sources/libtool
similarity index 100%
rename from jni/libopus/libtool
rename to jni/libopus/sources/libtool
diff --git a/jni/libopus/ltmain.sh b/jni/libopus/sources/ltmain.sh
similarity index 100%
rename from jni/libopus/ltmain.sh
rename to jni/libopus/sources/ltmain.sh
diff --git a/jni/libopus/m4/libtool.m4 b/jni/libopus/sources/m4/libtool.m4
similarity index 100%
rename from jni/libopus/m4/libtool.m4
rename to jni/libopus/sources/m4/libtool.m4
diff --git a/jni/libopus/m4/ltoptions.m4 b/jni/libopus/sources/m4/ltoptions.m4
similarity index 100%
rename from jni/libopus/m4/ltoptions.m4
rename to jni/libopus/sources/m4/ltoptions.m4
diff --git a/jni/libopus/m4/ltsugar.m4 b/jni/libopus/sources/m4/ltsugar.m4
similarity index 100%
rename from jni/libopus/m4/ltsugar.m4
rename to jni/libopus/sources/m4/ltsugar.m4
diff --git a/jni/libopus/m4/ltversion.m4 b/jni/libopus/sources/m4/ltversion.m4
similarity index 100%
rename from jni/libopus/m4/ltversion.m4
rename to jni/libopus/sources/m4/ltversion.m4
diff --git a/jni/libopus/m4/lt~obsolete.m4 b/jni/libopus/sources/m4/lt~obsolete.m4
similarity index 100%
rename from jni/libopus/m4/lt~obsolete.m4
rename to jni/libopus/sources/m4/lt~obsolete.m4
diff --git a/jni/libopus/missing b/jni/libopus/sources/missing
similarity index 100%
rename from jni/libopus/missing
rename to jni/libopus/sources/missing
diff --git a/jni/libopus/opus-uninstalled.pc b/jni/libopus/sources/opus-uninstalled.pc
similarity index 100%
rename from jni/libopus/opus-uninstalled.pc
rename to jni/libopus/sources/opus-uninstalled.pc
diff --git a/jni/libopus/opus-uninstalled.pc.in b/jni/libopus/sources/opus-uninstalled.pc.in
similarity index 100%
rename from jni/libopus/opus-uninstalled.pc.in
rename to jni/libopus/sources/opus-uninstalled.pc.in
diff --git a/jni/libopus/opus.m4 b/jni/libopus/sources/opus.m4
similarity index 100%
rename from jni/libopus/opus.m4
rename to jni/libopus/sources/opus.m4
diff --git a/jni/libopus/opus.pc b/jni/libopus/sources/opus.pc
similarity index 100%
rename from jni/libopus/opus.pc
rename to jni/libopus/sources/opus.pc
diff --git a/jni/libopus/opus.pc.in b/jni/libopus/sources/opus.pc.in
similarity index 100%
rename from jni/libopus/opus.pc.in
rename to jni/libopus/sources/opus.pc.in
diff --git a/jni/libopus/opus.sln b/jni/libopus/sources/opus.sln
similarity index 100%
rename from jni/libopus/opus.sln
rename to jni/libopus/sources/opus.sln
diff --git a/jni/libopus/opus_headers.mk b/jni/libopus/sources/opus_headers.mk
similarity index 100%
rename from jni/libopus/opus_headers.mk
rename to jni/libopus/sources/opus_headers.mk
diff --git a/jni/libopus/opus_sources.mk b/jni/libopus/sources/opus_sources.mk
similarity index 100%
rename from jni/libopus/opus_sources.mk
rename to jni/libopus/sources/opus_sources.mk
diff --git a/jni/libopus/package_version b/jni/libopus/sources/package_version
similarity index 100%
rename from jni/libopus/package_version
rename to jni/libopus/sources/package_version
diff --git a/jni/libopus/silk/.deps/.dirstamp b/jni/libopus/sources/silk/.deps/.dirstamp
similarity index 100%
rename from jni/libopus/silk/.deps/.dirstamp
rename to jni/libopus/sources/silk/.deps/.dirstamp
diff --git a/jni/libopus/silk/.deps/A2NLSF.Plo b/jni/libopus/sources/silk/.deps/A2NLSF.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/A2NLSF.Plo
rename to jni/libopus/sources/silk/.deps/A2NLSF.Plo
diff --git a/jni/libopus/silk/.deps/CNG.Plo b/jni/libopus/sources/silk/.deps/CNG.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/CNG.Plo
rename to jni/libopus/sources/silk/.deps/CNG.Plo
diff --git a/jni/libopus/silk/.deps/HP_variable_cutoff.Plo b/jni/libopus/sources/silk/.deps/HP_variable_cutoff.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/HP_variable_cutoff.Plo
rename to jni/libopus/sources/silk/.deps/HP_variable_cutoff.Plo
diff --git a/jni/libopus/silk/.deps/LPC_analysis_filter.Plo b/jni/libopus/sources/silk/.deps/LPC_analysis_filter.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/LPC_analysis_filter.Plo
rename to jni/libopus/sources/silk/.deps/LPC_analysis_filter.Plo
diff --git a/jni/libopus/silk/.deps/LPC_inv_pred_gain.Plo b/jni/libopus/sources/silk/.deps/LPC_inv_pred_gain.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/LPC_inv_pred_gain.Plo
rename to jni/libopus/sources/silk/.deps/LPC_inv_pred_gain.Plo
diff --git a/jni/libopus/silk/.deps/LP_variable_cutoff.Plo b/jni/libopus/sources/silk/.deps/LP_variable_cutoff.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/LP_variable_cutoff.Plo
rename to jni/libopus/sources/silk/.deps/LP_variable_cutoff.Plo
diff --git a/jni/libopus/silk/.deps/NLSF2A.Plo b/jni/libopus/sources/silk/.deps/NLSF2A.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF2A.Plo
rename to jni/libopus/sources/silk/.deps/NLSF2A.Plo
diff --git a/jni/libopus/silk/.deps/NLSF_VQ.Plo b/jni/libopus/sources/silk/.deps/NLSF_VQ.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF_VQ.Plo
rename to jni/libopus/sources/silk/.deps/NLSF_VQ.Plo
diff --git a/jni/libopus/silk/.deps/NLSF_VQ_weights_laroia.Plo b/jni/libopus/sources/silk/.deps/NLSF_VQ_weights_laroia.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF_VQ_weights_laroia.Plo
rename to jni/libopus/sources/silk/.deps/NLSF_VQ_weights_laroia.Plo
diff --git a/jni/libopus/silk/.deps/NLSF_decode.Plo b/jni/libopus/sources/silk/.deps/NLSF_decode.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF_decode.Plo
rename to jni/libopus/sources/silk/.deps/NLSF_decode.Plo
diff --git a/jni/libopus/silk/.deps/NLSF_del_dec_quant.Plo b/jni/libopus/sources/silk/.deps/NLSF_del_dec_quant.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF_del_dec_quant.Plo
rename to jni/libopus/sources/silk/.deps/NLSF_del_dec_quant.Plo
diff --git a/jni/libopus/silk/.deps/NLSF_encode.Plo b/jni/libopus/sources/silk/.deps/NLSF_encode.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF_encode.Plo
rename to jni/libopus/sources/silk/.deps/NLSF_encode.Plo
diff --git a/jni/libopus/silk/.deps/NLSF_stabilize.Plo b/jni/libopus/sources/silk/.deps/NLSF_stabilize.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF_stabilize.Plo
rename to jni/libopus/sources/silk/.deps/NLSF_stabilize.Plo
diff --git a/jni/libopus/silk/.deps/NLSF_unpack.Plo b/jni/libopus/sources/silk/.deps/NLSF_unpack.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NLSF_unpack.Plo
rename to jni/libopus/sources/silk/.deps/NLSF_unpack.Plo
diff --git a/jni/libopus/silk/.deps/NSQ.Plo b/jni/libopus/sources/silk/.deps/NSQ.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NSQ.Plo
rename to jni/libopus/sources/silk/.deps/NSQ.Plo
diff --git a/jni/libopus/silk/.deps/NSQ_del_dec.Plo b/jni/libopus/sources/silk/.deps/NSQ_del_dec.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/NSQ_del_dec.Plo
rename to jni/libopus/sources/silk/.deps/NSQ_del_dec.Plo
diff --git a/jni/libopus/silk/.deps/PLC.Plo b/jni/libopus/sources/silk/.deps/PLC.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/PLC.Plo
rename to jni/libopus/sources/silk/.deps/PLC.Plo
diff --git a/jni/libopus/silk/.deps/VAD.Plo b/jni/libopus/sources/silk/.deps/VAD.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/VAD.Plo
rename to jni/libopus/sources/silk/.deps/VAD.Plo
diff --git a/jni/libopus/silk/.deps/VQ_WMat_EC.Plo b/jni/libopus/sources/silk/.deps/VQ_WMat_EC.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/VQ_WMat_EC.Plo
rename to jni/libopus/sources/silk/.deps/VQ_WMat_EC.Plo
diff --git a/jni/libopus/silk/.deps/ana_filt_bank_1.Plo b/jni/libopus/sources/silk/.deps/ana_filt_bank_1.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/ana_filt_bank_1.Plo
rename to jni/libopus/sources/silk/.deps/ana_filt_bank_1.Plo
diff --git a/jni/libopus/silk/.deps/biquad_alt.Plo b/jni/libopus/sources/silk/.deps/biquad_alt.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/biquad_alt.Plo
rename to jni/libopus/sources/silk/.deps/biquad_alt.Plo
diff --git a/jni/libopus/silk/.deps/bwexpander.Plo b/jni/libopus/sources/silk/.deps/bwexpander.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/bwexpander.Plo
rename to jni/libopus/sources/silk/.deps/bwexpander.Plo
diff --git a/jni/libopus/silk/.deps/bwexpander_32.Plo b/jni/libopus/sources/silk/.deps/bwexpander_32.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/bwexpander_32.Plo
rename to jni/libopus/sources/silk/.deps/bwexpander_32.Plo
diff --git a/jni/libopus/silk/.deps/check_control_input.Plo b/jni/libopus/sources/silk/.deps/check_control_input.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/check_control_input.Plo
rename to jni/libopus/sources/silk/.deps/check_control_input.Plo
diff --git a/jni/libopus/silk/.deps/code_signs.Plo b/jni/libopus/sources/silk/.deps/code_signs.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/code_signs.Plo
rename to jni/libopus/sources/silk/.deps/code_signs.Plo
diff --git a/jni/libopus/silk/.deps/control_SNR.Plo b/jni/libopus/sources/silk/.deps/control_SNR.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/control_SNR.Plo
rename to jni/libopus/sources/silk/.deps/control_SNR.Plo
diff --git a/jni/libopus/silk/.deps/control_audio_bandwidth.Plo b/jni/libopus/sources/silk/.deps/control_audio_bandwidth.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/control_audio_bandwidth.Plo
rename to jni/libopus/sources/silk/.deps/control_audio_bandwidth.Plo
diff --git a/jni/libopus/silk/.deps/control_codec.Plo b/jni/libopus/sources/silk/.deps/control_codec.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/control_codec.Plo
rename to jni/libopus/sources/silk/.deps/control_codec.Plo
diff --git a/jni/libopus/silk/.deps/debug.Plo b/jni/libopus/sources/silk/.deps/debug.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/debug.Plo
rename to jni/libopus/sources/silk/.deps/debug.Plo
diff --git a/jni/libopus/silk/.deps/dec_API.Plo b/jni/libopus/sources/silk/.deps/dec_API.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/dec_API.Plo
rename to jni/libopus/sources/silk/.deps/dec_API.Plo
diff --git a/jni/libopus/silk/.deps/decode_core.Plo b/jni/libopus/sources/silk/.deps/decode_core.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/decode_core.Plo
rename to jni/libopus/sources/silk/.deps/decode_core.Plo
diff --git a/jni/libopus/silk/.deps/decode_frame.Plo b/jni/libopus/sources/silk/.deps/decode_frame.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/decode_frame.Plo
rename to jni/libopus/sources/silk/.deps/decode_frame.Plo
diff --git a/jni/libopus/silk/.deps/decode_indices.Plo b/jni/libopus/sources/silk/.deps/decode_indices.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/decode_indices.Plo
rename to jni/libopus/sources/silk/.deps/decode_indices.Plo
diff --git a/jni/libopus/silk/.deps/decode_parameters.Plo b/jni/libopus/sources/silk/.deps/decode_parameters.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/decode_parameters.Plo
rename to jni/libopus/sources/silk/.deps/decode_parameters.Plo
diff --git a/jni/libopus/silk/.deps/decode_pitch.Plo b/jni/libopus/sources/silk/.deps/decode_pitch.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/decode_pitch.Plo
rename to jni/libopus/sources/silk/.deps/decode_pitch.Plo
diff --git a/jni/libopus/silk/.deps/decode_pulses.Plo b/jni/libopus/sources/silk/.deps/decode_pulses.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/decode_pulses.Plo
rename to jni/libopus/sources/silk/.deps/decode_pulses.Plo
diff --git a/jni/libopus/silk/.deps/decoder_set_fs.Plo b/jni/libopus/sources/silk/.deps/decoder_set_fs.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/decoder_set_fs.Plo
rename to jni/libopus/sources/silk/.deps/decoder_set_fs.Plo
diff --git a/jni/libopus/silk/.deps/enc_API.Plo b/jni/libopus/sources/silk/.deps/enc_API.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/enc_API.Plo
rename to jni/libopus/sources/silk/.deps/enc_API.Plo
diff --git a/jni/libopus/silk/.deps/encode_indices.Plo b/jni/libopus/sources/silk/.deps/encode_indices.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/encode_indices.Plo
rename to jni/libopus/sources/silk/.deps/encode_indices.Plo
diff --git a/jni/libopus/silk/.deps/encode_pulses.Plo b/jni/libopus/sources/silk/.deps/encode_pulses.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/encode_pulses.Plo
rename to jni/libopus/sources/silk/.deps/encode_pulses.Plo
diff --git a/jni/libopus/silk/.deps/gain_quant.Plo b/jni/libopus/sources/silk/.deps/gain_quant.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/gain_quant.Plo
rename to jni/libopus/sources/silk/.deps/gain_quant.Plo
diff --git a/jni/libopus/silk/.deps/init_decoder.Plo b/jni/libopus/sources/silk/.deps/init_decoder.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/init_decoder.Plo
rename to jni/libopus/sources/silk/.deps/init_decoder.Plo
diff --git a/jni/libopus/silk/.deps/init_encoder.Plo b/jni/libopus/sources/silk/.deps/init_encoder.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/init_encoder.Plo
rename to jni/libopus/sources/silk/.deps/init_encoder.Plo
diff --git a/jni/libopus/silk/.deps/inner_prod_aligned.Plo b/jni/libopus/sources/silk/.deps/inner_prod_aligned.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/inner_prod_aligned.Plo
rename to jni/libopus/sources/silk/.deps/inner_prod_aligned.Plo
diff --git a/jni/libopus/silk/.deps/interpolate.Plo b/jni/libopus/sources/silk/.deps/interpolate.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/interpolate.Plo
rename to jni/libopus/sources/silk/.deps/interpolate.Plo
diff --git a/jni/libopus/silk/.deps/lin2log.Plo b/jni/libopus/sources/silk/.deps/lin2log.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/lin2log.Plo
rename to jni/libopus/sources/silk/.deps/lin2log.Plo
diff --git a/jni/libopus/silk/.deps/log2lin.Plo b/jni/libopus/sources/silk/.deps/log2lin.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/log2lin.Plo
rename to jni/libopus/sources/silk/.deps/log2lin.Plo
diff --git a/jni/libopus/silk/.deps/pitch_est_tables.Plo b/jni/libopus/sources/silk/.deps/pitch_est_tables.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/pitch_est_tables.Plo
rename to jni/libopus/sources/silk/.deps/pitch_est_tables.Plo
diff --git a/jni/libopus/silk/.deps/process_NLSFs.Plo b/jni/libopus/sources/silk/.deps/process_NLSFs.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/process_NLSFs.Plo
rename to jni/libopus/sources/silk/.deps/process_NLSFs.Plo
diff --git a/jni/libopus/silk/.deps/quant_LTP_gains.Plo b/jni/libopus/sources/silk/.deps/quant_LTP_gains.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/quant_LTP_gains.Plo
rename to jni/libopus/sources/silk/.deps/quant_LTP_gains.Plo
diff --git a/jni/libopus/silk/.deps/resampler.Plo b/jni/libopus/sources/silk/.deps/resampler.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler.Plo
rename to jni/libopus/sources/silk/.deps/resampler.Plo
diff --git a/jni/libopus/silk/.deps/resampler_down2.Plo b/jni/libopus/sources/silk/.deps/resampler_down2.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler_down2.Plo
rename to jni/libopus/sources/silk/.deps/resampler_down2.Plo
diff --git a/jni/libopus/silk/.deps/resampler_down2_3.Plo b/jni/libopus/sources/silk/.deps/resampler_down2_3.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler_down2_3.Plo
rename to jni/libopus/sources/silk/.deps/resampler_down2_3.Plo
diff --git a/jni/libopus/silk/.deps/resampler_private_AR2.Plo b/jni/libopus/sources/silk/.deps/resampler_private_AR2.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler_private_AR2.Plo
rename to jni/libopus/sources/silk/.deps/resampler_private_AR2.Plo
diff --git a/jni/libopus/silk/.deps/resampler_private_IIR_FIR.Plo b/jni/libopus/sources/silk/.deps/resampler_private_IIR_FIR.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler_private_IIR_FIR.Plo
rename to jni/libopus/sources/silk/.deps/resampler_private_IIR_FIR.Plo
diff --git a/jni/libopus/silk/.deps/resampler_private_down_FIR.Plo b/jni/libopus/sources/silk/.deps/resampler_private_down_FIR.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler_private_down_FIR.Plo
rename to jni/libopus/sources/silk/.deps/resampler_private_down_FIR.Plo
diff --git a/jni/libopus/silk/.deps/resampler_private_up2_HQ.Plo b/jni/libopus/sources/silk/.deps/resampler_private_up2_HQ.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler_private_up2_HQ.Plo
rename to jni/libopus/sources/silk/.deps/resampler_private_up2_HQ.Plo
diff --git a/jni/libopus/silk/.deps/resampler_rom.Plo b/jni/libopus/sources/silk/.deps/resampler_rom.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/resampler_rom.Plo
rename to jni/libopus/sources/silk/.deps/resampler_rom.Plo
diff --git a/jni/libopus/silk/.deps/shell_coder.Plo b/jni/libopus/sources/silk/.deps/shell_coder.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/shell_coder.Plo
rename to jni/libopus/sources/silk/.deps/shell_coder.Plo
diff --git a/jni/libopus/silk/.deps/sigm_Q15.Plo b/jni/libopus/sources/silk/.deps/sigm_Q15.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/sigm_Q15.Plo
rename to jni/libopus/sources/silk/.deps/sigm_Q15.Plo
diff --git a/jni/libopus/silk/.deps/sort.Plo b/jni/libopus/sources/silk/.deps/sort.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/sort.Plo
rename to jni/libopus/sources/silk/.deps/sort.Plo
diff --git a/jni/libopus/silk/.deps/stereo_LR_to_MS.Plo b/jni/libopus/sources/silk/.deps/stereo_LR_to_MS.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/stereo_LR_to_MS.Plo
rename to jni/libopus/sources/silk/.deps/stereo_LR_to_MS.Plo
diff --git a/jni/libopus/silk/.deps/stereo_MS_to_LR.Plo b/jni/libopus/sources/silk/.deps/stereo_MS_to_LR.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/stereo_MS_to_LR.Plo
rename to jni/libopus/sources/silk/.deps/stereo_MS_to_LR.Plo
diff --git a/jni/libopus/silk/.deps/stereo_decode_pred.Plo b/jni/libopus/sources/silk/.deps/stereo_decode_pred.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/stereo_decode_pred.Plo
rename to jni/libopus/sources/silk/.deps/stereo_decode_pred.Plo
diff --git a/jni/libopus/silk/.deps/stereo_encode_pred.Plo b/jni/libopus/sources/silk/.deps/stereo_encode_pred.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/stereo_encode_pred.Plo
rename to jni/libopus/sources/silk/.deps/stereo_encode_pred.Plo
diff --git a/jni/libopus/silk/.deps/stereo_find_predictor.Plo b/jni/libopus/sources/silk/.deps/stereo_find_predictor.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/stereo_find_predictor.Plo
rename to jni/libopus/sources/silk/.deps/stereo_find_predictor.Plo
diff --git a/jni/libopus/silk/.deps/stereo_quant_pred.Plo b/jni/libopus/sources/silk/.deps/stereo_quant_pred.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/stereo_quant_pred.Plo
rename to jni/libopus/sources/silk/.deps/stereo_quant_pred.Plo
diff --git a/jni/libopus/silk/.deps/sum_sqr_shift.Plo b/jni/libopus/sources/silk/.deps/sum_sqr_shift.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/sum_sqr_shift.Plo
rename to jni/libopus/sources/silk/.deps/sum_sqr_shift.Plo
diff --git a/jni/libopus/silk/.deps/table_LSF_cos.Plo b/jni/libopus/sources/silk/.deps/table_LSF_cos.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/table_LSF_cos.Plo
rename to jni/libopus/sources/silk/.deps/table_LSF_cos.Plo
diff --git a/jni/libopus/silk/.deps/tables_LTP.Plo b/jni/libopus/sources/silk/.deps/tables_LTP.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/tables_LTP.Plo
rename to jni/libopus/sources/silk/.deps/tables_LTP.Plo
diff --git a/jni/libopus/silk/.deps/tables_NLSF_CB_NB_MB.Plo b/jni/libopus/sources/silk/.deps/tables_NLSF_CB_NB_MB.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/tables_NLSF_CB_NB_MB.Plo
rename to jni/libopus/sources/silk/.deps/tables_NLSF_CB_NB_MB.Plo
diff --git a/jni/libopus/silk/.deps/tables_NLSF_CB_WB.Plo b/jni/libopus/sources/silk/.deps/tables_NLSF_CB_WB.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/tables_NLSF_CB_WB.Plo
rename to jni/libopus/sources/silk/.deps/tables_NLSF_CB_WB.Plo
diff --git a/jni/libopus/silk/.deps/tables_gain.Plo b/jni/libopus/sources/silk/.deps/tables_gain.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/tables_gain.Plo
rename to jni/libopus/sources/silk/.deps/tables_gain.Plo
diff --git a/jni/libopus/silk/.deps/tables_other.Plo b/jni/libopus/sources/silk/.deps/tables_other.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/tables_other.Plo
rename to jni/libopus/sources/silk/.deps/tables_other.Plo
diff --git a/jni/libopus/silk/.deps/tables_pitch_lag.Plo b/jni/libopus/sources/silk/.deps/tables_pitch_lag.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/tables_pitch_lag.Plo
rename to jni/libopus/sources/silk/.deps/tables_pitch_lag.Plo
diff --git a/jni/libopus/silk/.deps/tables_pulses_per_block.Plo b/jni/libopus/sources/silk/.deps/tables_pulses_per_block.Plo
similarity index 100%
rename from jni/libopus/silk/.deps/tables_pulses_per_block.Plo
rename to jni/libopus/sources/silk/.deps/tables_pulses_per_block.Plo
diff --git a/jni/libopus/silk/.dirstamp b/jni/libopus/sources/silk/.dirstamp
similarity index 100%
rename from jni/libopus/silk/.dirstamp
rename to jni/libopus/sources/silk/.dirstamp
diff --git a/jni/libopus/silk/A2NLSF.c b/jni/libopus/sources/silk/A2NLSF.c
similarity index 100%
rename from jni/libopus/silk/A2NLSF.c
rename to jni/libopus/sources/silk/A2NLSF.c
diff --git a/jni/libopus/silk/API.h b/jni/libopus/sources/silk/API.h
similarity index 100%
rename from jni/libopus/silk/API.h
rename to jni/libopus/sources/silk/API.h
diff --git a/jni/libopus/silk/CNG.c b/jni/libopus/sources/silk/CNG.c
similarity index 100%
rename from jni/libopus/silk/CNG.c
rename to jni/libopus/sources/silk/CNG.c
diff --git a/jni/libopus/silk/HP_variable_cutoff.c b/jni/libopus/sources/silk/HP_variable_cutoff.c
similarity index 100%
rename from jni/libopus/silk/HP_variable_cutoff.c
rename to jni/libopus/sources/silk/HP_variable_cutoff.c
diff --git a/jni/libopus/silk/Inlines.h b/jni/libopus/sources/silk/Inlines.h
similarity index 100%
rename from jni/libopus/silk/Inlines.h
rename to jni/libopus/sources/silk/Inlines.h
diff --git a/jni/libopus/silk/LPC_analysis_filter.c b/jni/libopus/sources/silk/LPC_analysis_filter.c
similarity index 100%
rename from jni/libopus/silk/LPC_analysis_filter.c
rename to jni/libopus/sources/silk/LPC_analysis_filter.c
diff --git a/jni/libopus/silk/LPC_inv_pred_gain.c b/jni/libopus/sources/silk/LPC_inv_pred_gain.c
similarity index 100%
rename from jni/libopus/silk/LPC_inv_pred_gain.c
rename to jni/libopus/sources/silk/LPC_inv_pred_gain.c
diff --git a/jni/libopus/silk/LP_variable_cutoff.c b/jni/libopus/sources/silk/LP_variable_cutoff.c
similarity index 100%
rename from jni/libopus/silk/LP_variable_cutoff.c
rename to jni/libopus/sources/silk/LP_variable_cutoff.c
diff --git a/jni/libopus/silk/MacroCount.h b/jni/libopus/sources/silk/MacroCount.h
similarity index 100%
rename from jni/libopus/silk/MacroCount.h
rename to jni/libopus/sources/silk/MacroCount.h
diff --git a/jni/libopus/silk/MacroDebug.h b/jni/libopus/sources/silk/MacroDebug.h
similarity index 100%
rename from jni/libopus/silk/MacroDebug.h
rename to jni/libopus/sources/silk/MacroDebug.h
diff --git a/jni/libopus/silk/NLSF2A.c b/jni/libopus/sources/silk/NLSF2A.c
similarity index 100%
rename from jni/libopus/silk/NLSF2A.c
rename to jni/libopus/sources/silk/NLSF2A.c
diff --git a/jni/libopus/silk/NLSF_VQ.c b/jni/libopus/sources/silk/NLSF_VQ.c
similarity index 100%
rename from jni/libopus/silk/NLSF_VQ.c
rename to jni/libopus/sources/silk/NLSF_VQ.c
diff --git a/jni/libopus/silk/NLSF_VQ_weights_laroia.c b/jni/libopus/sources/silk/NLSF_VQ_weights_laroia.c
similarity index 100%
rename from jni/libopus/silk/NLSF_VQ_weights_laroia.c
rename to jni/libopus/sources/silk/NLSF_VQ_weights_laroia.c
diff --git a/jni/libopus/silk/NLSF_decode.c b/jni/libopus/sources/silk/NLSF_decode.c
similarity index 100%
rename from jni/libopus/silk/NLSF_decode.c
rename to jni/libopus/sources/silk/NLSF_decode.c
diff --git a/jni/libopus/silk/NLSF_del_dec_quant.c b/jni/libopus/sources/silk/NLSF_del_dec_quant.c
similarity index 100%
rename from jni/libopus/silk/NLSF_del_dec_quant.c
rename to jni/libopus/sources/silk/NLSF_del_dec_quant.c
diff --git a/jni/libopus/silk/NLSF_encode.c b/jni/libopus/sources/silk/NLSF_encode.c
similarity index 100%
rename from jni/libopus/silk/NLSF_encode.c
rename to jni/libopus/sources/silk/NLSF_encode.c
diff --git a/jni/libopus/silk/NLSF_stabilize.c b/jni/libopus/sources/silk/NLSF_stabilize.c
similarity index 100%
rename from jni/libopus/silk/NLSF_stabilize.c
rename to jni/libopus/sources/silk/NLSF_stabilize.c
diff --git a/jni/libopus/silk/NLSF_unpack.c b/jni/libopus/sources/silk/NLSF_unpack.c
similarity index 100%
rename from jni/libopus/silk/NLSF_unpack.c
rename to jni/libopus/sources/silk/NLSF_unpack.c
diff --git a/jni/libopus/silk/NSQ.c b/jni/libopus/sources/silk/NSQ.c
similarity index 100%
rename from jni/libopus/silk/NSQ.c
rename to jni/libopus/sources/silk/NSQ.c
diff --git a/jni/libopus/silk/NSQ_del_dec.c b/jni/libopus/sources/silk/NSQ_del_dec.c
similarity index 100%
rename from jni/libopus/silk/NSQ_del_dec.c
rename to jni/libopus/sources/silk/NSQ_del_dec.c
diff --git a/jni/libopus/silk/PLC.c b/jni/libopus/sources/silk/PLC.c
similarity index 100%
rename from jni/libopus/silk/PLC.c
rename to jni/libopus/sources/silk/PLC.c
diff --git a/jni/libopus/silk/PLC.h b/jni/libopus/sources/silk/PLC.h
similarity index 100%
rename from jni/libopus/silk/PLC.h
rename to jni/libopus/sources/silk/PLC.h
diff --git a/jni/libopus/silk/SigProc_FIX.h b/jni/libopus/sources/silk/SigProc_FIX.h
similarity index 100%
rename from jni/libopus/silk/SigProc_FIX.h
rename to jni/libopus/sources/silk/SigProc_FIX.h
diff --git a/jni/libopus/silk/VAD.c b/jni/libopus/sources/silk/VAD.c
similarity index 100%
rename from jni/libopus/silk/VAD.c
rename to jni/libopus/sources/silk/VAD.c
diff --git a/jni/libopus/silk/VQ_WMat_EC.c b/jni/libopus/sources/silk/VQ_WMat_EC.c
similarity index 100%
rename from jni/libopus/silk/VQ_WMat_EC.c
rename to jni/libopus/sources/silk/VQ_WMat_EC.c
diff --git a/jni/libopus/silk/ana_filt_bank_1.c b/jni/libopus/sources/silk/ana_filt_bank_1.c
similarity index 100%
rename from jni/libopus/silk/ana_filt_bank_1.c
rename to jni/libopus/sources/silk/ana_filt_bank_1.c
diff --git a/jni/libopus/silk/biquad_alt.c b/jni/libopus/sources/silk/biquad_alt.c
similarity index 100%
rename from jni/libopus/silk/biquad_alt.c
rename to jni/libopus/sources/silk/biquad_alt.c
diff --git a/jni/libopus/silk/bwexpander.c b/jni/libopus/sources/silk/bwexpander.c
similarity index 100%
rename from jni/libopus/silk/bwexpander.c
rename to jni/libopus/sources/silk/bwexpander.c
diff --git a/jni/libopus/silk/bwexpander_32.c b/jni/libopus/sources/silk/bwexpander_32.c
similarity index 100%
rename from jni/libopus/silk/bwexpander_32.c
rename to jni/libopus/sources/silk/bwexpander_32.c
diff --git a/jni/libopus/silk/check_control_input.c b/jni/libopus/sources/silk/check_control_input.c
similarity index 100%
rename from jni/libopus/silk/check_control_input.c
rename to jni/libopus/sources/silk/check_control_input.c
diff --git a/jni/libopus/silk/code_signs.c b/jni/libopus/sources/silk/code_signs.c
similarity index 100%
rename from jni/libopus/silk/code_signs.c
rename to jni/libopus/sources/silk/code_signs.c
diff --git a/jni/libopus/silk/control.h b/jni/libopus/sources/silk/control.h
similarity index 100%
rename from jni/libopus/silk/control.h
rename to jni/libopus/sources/silk/control.h
diff --git a/jni/libopus/silk/control_SNR.c b/jni/libopus/sources/silk/control_SNR.c
similarity index 100%
rename from jni/libopus/silk/control_SNR.c
rename to jni/libopus/sources/silk/control_SNR.c
diff --git a/jni/libopus/silk/control_audio_bandwidth.c b/jni/libopus/sources/silk/control_audio_bandwidth.c
similarity index 100%
rename from jni/libopus/silk/control_audio_bandwidth.c
rename to jni/libopus/sources/silk/control_audio_bandwidth.c
diff --git a/jni/libopus/silk/control_codec.c b/jni/libopus/sources/silk/control_codec.c
similarity index 100%
rename from jni/libopus/silk/control_codec.c
rename to jni/libopus/sources/silk/control_codec.c
diff --git a/jni/libopus/silk/debug.c b/jni/libopus/sources/silk/debug.c
similarity index 100%
rename from jni/libopus/silk/debug.c
rename to jni/libopus/sources/silk/debug.c
diff --git a/jni/libopus/silk/debug.h b/jni/libopus/sources/silk/debug.h
similarity index 100%
rename from jni/libopus/silk/debug.h
rename to jni/libopus/sources/silk/debug.h
diff --git a/jni/libopus/silk/dec_API.c b/jni/libopus/sources/silk/dec_API.c
similarity index 100%
rename from jni/libopus/silk/dec_API.c
rename to jni/libopus/sources/silk/dec_API.c
diff --git a/jni/libopus/silk/decode_core.c b/jni/libopus/sources/silk/decode_core.c
similarity index 100%
rename from jni/libopus/silk/decode_core.c
rename to jni/libopus/sources/silk/decode_core.c
diff --git a/jni/libopus/silk/decode_frame.c b/jni/libopus/sources/silk/decode_frame.c
similarity index 100%
rename from jni/libopus/silk/decode_frame.c
rename to jni/libopus/sources/silk/decode_frame.c
diff --git a/jni/libopus/silk/decode_indices.c b/jni/libopus/sources/silk/decode_indices.c
similarity index 100%
rename from jni/libopus/silk/decode_indices.c
rename to jni/libopus/sources/silk/decode_indices.c
diff --git a/jni/libopus/silk/decode_parameters.c b/jni/libopus/sources/silk/decode_parameters.c
similarity index 100%
rename from jni/libopus/silk/decode_parameters.c
rename to jni/libopus/sources/silk/decode_parameters.c
diff --git a/jni/libopus/silk/decode_pitch.c b/jni/libopus/sources/silk/decode_pitch.c
similarity index 100%
rename from jni/libopus/silk/decode_pitch.c
rename to jni/libopus/sources/silk/decode_pitch.c
diff --git a/jni/libopus/silk/decode_pulses.c b/jni/libopus/sources/silk/decode_pulses.c
similarity index 100%
rename from jni/libopus/silk/decode_pulses.c
rename to jni/libopus/sources/silk/decode_pulses.c
diff --git a/jni/libopus/silk/decoder_set_fs.c b/jni/libopus/sources/silk/decoder_set_fs.c
similarity index 100%
rename from jni/libopus/silk/decoder_set_fs.c
rename to jni/libopus/sources/silk/decoder_set_fs.c
diff --git a/jni/libopus/silk/define.h b/jni/libopus/sources/silk/define.h
similarity index 100%
rename from jni/libopus/silk/define.h
rename to jni/libopus/sources/silk/define.h
diff --git a/jni/libopus/silk/enc_API.c b/jni/libopus/sources/silk/enc_API.c
similarity index 100%
rename from jni/libopus/silk/enc_API.c
rename to jni/libopus/sources/silk/enc_API.c
diff --git a/jni/libopus/silk/encode_indices.c b/jni/libopus/sources/silk/encode_indices.c
similarity index 100%
rename from jni/libopus/silk/encode_indices.c
rename to jni/libopus/sources/silk/encode_indices.c
diff --git a/jni/libopus/silk/encode_pulses.c b/jni/libopus/sources/silk/encode_pulses.c
similarity index 100%
rename from jni/libopus/silk/encode_pulses.c
rename to jni/libopus/sources/silk/encode_pulses.c
diff --git a/jni/libopus/silk/errors.h b/jni/libopus/sources/silk/errors.h
similarity index 100%
rename from jni/libopus/silk/errors.h
rename to jni/libopus/sources/silk/errors.h
diff --git a/jni/libopus/silk/fixed/.deps/LTP_analysis_filter_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/LTP_analysis_filter_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/LTP_analysis_filter_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/LTP_analysis_filter_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/LTP_scale_ctrl_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/LTP_scale_ctrl_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/LTP_scale_ctrl_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/LTP_scale_ctrl_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/apply_sine_window_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/apply_sine_window_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/apply_sine_window_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/apply_sine_window_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/autocorr_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/autocorr_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/autocorr_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/autocorr_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/burg_modified_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/burg_modified_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/burg_modified_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/burg_modified_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/corrMatrix_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/corrMatrix_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/corrMatrix_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/corrMatrix_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/encode_frame_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/encode_frame_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/encode_frame_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/encode_frame_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/find_LPC_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/find_LPC_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/find_LPC_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/find_LPC_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/find_LTP_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/find_LTP_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/find_LTP_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/find_LTP_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/find_pitch_lags_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/find_pitch_lags_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/find_pitch_lags_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/find_pitch_lags_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/find_pred_coefs_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/find_pred_coefs_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/find_pred_coefs_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/find_pred_coefs_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/k2a_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/k2a_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/k2a_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/k2a_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/k2a_Q16_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/k2a_Q16_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/k2a_Q16_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/k2a_Q16_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/noise_shape_analysis_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/noise_shape_analysis_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/noise_shape_analysis_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/noise_shape_analysis_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/pitch_analysis_core_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/pitch_analysis_core_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/pitch_analysis_core_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/pitch_analysis_core_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/prefilter_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/prefilter_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/prefilter_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/prefilter_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/process_gains_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/process_gains_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/process_gains_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/process_gains_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/regularize_correlations_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/regularize_correlations_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/regularize_correlations_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/regularize_correlations_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/residual_energy16_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/residual_energy16_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/residual_energy16_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/residual_energy16_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/residual_energy_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/residual_energy_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/residual_energy_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/residual_energy_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/schur64_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/schur64_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/schur64_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/schur64_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/schur_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/schur_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/schur_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/schur_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/solve_LS_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/solve_LS_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/solve_LS_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/solve_LS_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/vector_ops_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/vector_ops_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/vector_ops_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/vector_ops_FIX.Plo
diff --git a/jni/libopus/silk/fixed/.deps/warped_autocorrelation_FIX.Plo b/jni/libopus/sources/silk/fixed/.deps/warped_autocorrelation_FIX.Plo
similarity index 100%
rename from jni/libopus/silk/fixed/.deps/warped_autocorrelation_FIX.Plo
rename to jni/libopus/sources/silk/fixed/.deps/warped_autocorrelation_FIX.Plo
diff --git a/jni/libopus/silk/fixed/LTP_analysis_filter_FIX.c b/jni/libopus/sources/silk/fixed/LTP_analysis_filter_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/LTP_analysis_filter_FIX.c
rename to jni/libopus/sources/silk/fixed/LTP_analysis_filter_FIX.c
diff --git a/jni/libopus/silk/fixed/LTP_scale_ctrl_FIX.c b/jni/libopus/sources/silk/fixed/LTP_scale_ctrl_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/LTP_scale_ctrl_FIX.c
rename to jni/libopus/sources/silk/fixed/LTP_scale_ctrl_FIX.c
diff --git a/jni/libopus/silk/fixed/apply_sine_window_FIX.c b/jni/libopus/sources/silk/fixed/apply_sine_window_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/apply_sine_window_FIX.c
rename to jni/libopus/sources/silk/fixed/apply_sine_window_FIX.c
diff --git a/jni/libopus/silk/fixed/autocorr_FIX.c b/jni/libopus/sources/silk/fixed/autocorr_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/autocorr_FIX.c
rename to jni/libopus/sources/silk/fixed/autocorr_FIX.c
diff --git a/jni/libopus/silk/fixed/burg_modified_FIX.c b/jni/libopus/sources/silk/fixed/burg_modified_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/burg_modified_FIX.c
rename to jni/libopus/sources/silk/fixed/burg_modified_FIX.c
diff --git a/jni/libopus/silk/fixed/corrMatrix_FIX.c b/jni/libopus/sources/silk/fixed/corrMatrix_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/corrMatrix_FIX.c
rename to jni/libopus/sources/silk/fixed/corrMatrix_FIX.c
diff --git a/jni/libopus/silk/fixed/encode_frame_FIX.c b/jni/libopus/sources/silk/fixed/encode_frame_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/encode_frame_FIX.c
rename to jni/libopus/sources/silk/fixed/encode_frame_FIX.c
diff --git a/jni/libopus/silk/fixed/find_LPC_FIX.c b/jni/libopus/sources/silk/fixed/find_LPC_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/find_LPC_FIX.c
rename to jni/libopus/sources/silk/fixed/find_LPC_FIX.c
diff --git a/jni/libopus/silk/fixed/find_LTP_FIX.c b/jni/libopus/sources/silk/fixed/find_LTP_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/find_LTP_FIX.c
rename to jni/libopus/sources/silk/fixed/find_LTP_FIX.c
diff --git a/jni/libopus/silk/fixed/find_pitch_lags_FIX.c b/jni/libopus/sources/silk/fixed/find_pitch_lags_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/find_pitch_lags_FIX.c
rename to jni/libopus/sources/silk/fixed/find_pitch_lags_FIX.c
diff --git a/jni/libopus/silk/fixed/find_pred_coefs_FIX.c b/jni/libopus/sources/silk/fixed/find_pred_coefs_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/find_pred_coefs_FIX.c
rename to jni/libopus/sources/silk/fixed/find_pred_coefs_FIX.c
diff --git a/jni/libopus/silk/fixed/k2a_FIX.c b/jni/libopus/sources/silk/fixed/k2a_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/k2a_FIX.c
rename to jni/libopus/sources/silk/fixed/k2a_FIX.c
diff --git a/jni/libopus/silk/fixed/k2a_Q16_FIX.c b/jni/libopus/sources/silk/fixed/k2a_Q16_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/k2a_Q16_FIX.c
rename to jni/libopus/sources/silk/fixed/k2a_Q16_FIX.c
diff --git a/jni/libopus/silk/fixed/main_FIX.h b/jni/libopus/sources/silk/fixed/main_FIX.h
similarity index 100%
rename from jni/libopus/silk/fixed/main_FIX.h
rename to jni/libopus/sources/silk/fixed/main_FIX.h
diff --git a/jni/libopus/silk/fixed/noise_shape_analysis_FIX.c b/jni/libopus/sources/silk/fixed/noise_shape_analysis_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/noise_shape_analysis_FIX.c
rename to jni/libopus/sources/silk/fixed/noise_shape_analysis_FIX.c
diff --git a/jni/libopus/silk/fixed/pitch_analysis_core_FIX.c b/jni/libopus/sources/silk/fixed/pitch_analysis_core_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/pitch_analysis_core_FIX.c
rename to jni/libopus/sources/silk/fixed/pitch_analysis_core_FIX.c
diff --git a/jni/libopus/silk/fixed/prefilter_FIX.c b/jni/libopus/sources/silk/fixed/prefilter_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/prefilter_FIX.c
rename to jni/libopus/sources/silk/fixed/prefilter_FIX.c
diff --git a/jni/libopus/silk/fixed/process_gains_FIX.c b/jni/libopus/sources/silk/fixed/process_gains_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/process_gains_FIX.c
rename to jni/libopus/sources/silk/fixed/process_gains_FIX.c
diff --git a/jni/libopus/silk/fixed/regularize_correlations_FIX.c b/jni/libopus/sources/silk/fixed/regularize_correlations_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/regularize_correlations_FIX.c
rename to jni/libopus/sources/silk/fixed/regularize_correlations_FIX.c
diff --git a/jni/libopus/silk/fixed/residual_energy16_FIX.c b/jni/libopus/sources/silk/fixed/residual_energy16_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/residual_energy16_FIX.c
rename to jni/libopus/sources/silk/fixed/residual_energy16_FIX.c
diff --git a/jni/libopus/silk/fixed/residual_energy_FIX.c b/jni/libopus/sources/silk/fixed/residual_energy_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/residual_energy_FIX.c
rename to jni/libopus/sources/silk/fixed/residual_energy_FIX.c
diff --git a/jni/libopus/silk/fixed/schur64_FIX.c b/jni/libopus/sources/silk/fixed/schur64_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/schur64_FIX.c
rename to jni/libopus/sources/silk/fixed/schur64_FIX.c
diff --git a/jni/libopus/silk/fixed/schur_FIX.c b/jni/libopus/sources/silk/fixed/schur_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/schur_FIX.c
rename to jni/libopus/sources/silk/fixed/schur_FIX.c
diff --git a/jni/libopus/silk/fixed/silk_fixed.vcxproj b/jni/libopus/sources/silk/fixed/silk_fixed.vcxproj
similarity index 100%
rename from jni/libopus/silk/fixed/silk_fixed.vcxproj
rename to jni/libopus/sources/silk/fixed/silk_fixed.vcxproj
diff --git a/jni/libopus/silk/fixed/silk_fixed.vcxproj.filters b/jni/libopus/sources/silk/fixed/silk_fixed.vcxproj.filters
similarity index 100%
rename from jni/libopus/silk/fixed/silk_fixed.vcxproj.filters
rename to jni/libopus/sources/silk/fixed/silk_fixed.vcxproj.filters
diff --git a/jni/libopus/silk/fixed/solve_LS_FIX.c b/jni/libopus/sources/silk/fixed/solve_LS_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/solve_LS_FIX.c
rename to jni/libopus/sources/silk/fixed/solve_LS_FIX.c
diff --git a/jni/libopus/silk/fixed/structs_FIX.h b/jni/libopus/sources/silk/fixed/structs_FIX.h
similarity index 100%
rename from jni/libopus/silk/fixed/structs_FIX.h
rename to jni/libopus/sources/silk/fixed/structs_FIX.h
diff --git a/jni/libopus/silk/fixed/vector_ops_FIX.c b/jni/libopus/sources/silk/fixed/vector_ops_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/vector_ops_FIX.c
rename to jni/libopus/sources/silk/fixed/vector_ops_FIX.c
diff --git a/jni/libopus/silk/fixed/warped_autocorrelation_FIX.c b/jni/libopus/sources/silk/fixed/warped_autocorrelation_FIX.c
similarity index 100%
rename from jni/libopus/silk/fixed/warped_autocorrelation_FIX.c
rename to jni/libopus/sources/silk/fixed/warped_autocorrelation_FIX.c
diff --git a/jni/libopus/silk/float/.deps/.dirstamp b/jni/libopus/sources/silk/float/.deps/.dirstamp
similarity index 100%
rename from jni/libopus/silk/float/.deps/.dirstamp
rename to jni/libopus/sources/silk/float/.deps/.dirstamp
diff --git a/jni/libopus/silk/float/.deps/LPC_analysis_filter_FLP.Plo b/jni/libopus/sources/silk/float/.deps/LPC_analysis_filter_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/LPC_analysis_filter_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/LPC_analysis_filter_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/LPC_inv_pred_gain_FLP.Plo b/jni/libopus/sources/silk/float/.deps/LPC_inv_pred_gain_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/LPC_inv_pred_gain_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/LPC_inv_pred_gain_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/LTP_analysis_filter_FLP.Plo b/jni/libopus/sources/silk/float/.deps/LTP_analysis_filter_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/LTP_analysis_filter_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/LTP_analysis_filter_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/LTP_scale_ctrl_FLP.Plo b/jni/libopus/sources/silk/float/.deps/LTP_scale_ctrl_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/LTP_scale_ctrl_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/LTP_scale_ctrl_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/apply_sine_window_FLP.Plo b/jni/libopus/sources/silk/float/.deps/apply_sine_window_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/apply_sine_window_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/apply_sine_window_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/autocorrelation_FLP.Plo b/jni/libopus/sources/silk/float/.deps/autocorrelation_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/autocorrelation_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/autocorrelation_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/burg_modified_FLP.Plo b/jni/libopus/sources/silk/float/.deps/burg_modified_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/burg_modified_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/burg_modified_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/bwexpander_FLP.Plo b/jni/libopus/sources/silk/float/.deps/bwexpander_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/bwexpander_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/bwexpander_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/corrMatrix_FLP.Plo b/jni/libopus/sources/silk/float/.deps/corrMatrix_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/corrMatrix_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/corrMatrix_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/encode_frame_FLP.Plo b/jni/libopus/sources/silk/float/.deps/encode_frame_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/encode_frame_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/encode_frame_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/energy_FLP.Plo b/jni/libopus/sources/silk/float/.deps/energy_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/energy_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/energy_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/find_LPC_FLP.Plo b/jni/libopus/sources/silk/float/.deps/find_LPC_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/find_LPC_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/find_LPC_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/find_LTP_FLP.Plo b/jni/libopus/sources/silk/float/.deps/find_LTP_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/find_LTP_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/find_LTP_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/find_pitch_lags_FLP.Plo b/jni/libopus/sources/silk/float/.deps/find_pitch_lags_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/find_pitch_lags_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/find_pitch_lags_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/find_pred_coefs_FLP.Plo b/jni/libopus/sources/silk/float/.deps/find_pred_coefs_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/find_pred_coefs_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/find_pred_coefs_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/inner_product_FLP.Plo b/jni/libopus/sources/silk/float/.deps/inner_product_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/inner_product_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/inner_product_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/k2a_FLP.Plo b/jni/libopus/sources/silk/float/.deps/k2a_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/k2a_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/k2a_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/levinsondurbin_FLP.Plo b/jni/libopus/sources/silk/float/.deps/levinsondurbin_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/levinsondurbin_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/levinsondurbin_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/noise_shape_analysis_FLP.Plo b/jni/libopus/sources/silk/float/.deps/noise_shape_analysis_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/noise_shape_analysis_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/noise_shape_analysis_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/pitch_analysis_core_FLP.Plo b/jni/libopus/sources/silk/float/.deps/pitch_analysis_core_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/pitch_analysis_core_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/pitch_analysis_core_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/prefilter_FLP.Plo b/jni/libopus/sources/silk/float/.deps/prefilter_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/prefilter_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/prefilter_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/process_gains_FLP.Plo b/jni/libopus/sources/silk/float/.deps/process_gains_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/process_gains_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/process_gains_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/regularize_correlations_FLP.Plo b/jni/libopus/sources/silk/float/.deps/regularize_correlations_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/regularize_correlations_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/regularize_correlations_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/residual_energy_FLP.Plo b/jni/libopus/sources/silk/float/.deps/residual_energy_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/residual_energy_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/residual_energy_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/scale_copy_vector_FLP.Plo b/jni/libopus/sources/silk/float/.deps/scale_copy_vector_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/scale_copy_vector_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/scale_copy_vector_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/scale_vector_FLP.Plo b/jni/libopus/sources/silk/float/.deps/scale_vector_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/scale_vector_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/scale_vector_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/schur_FLP.Plo b/jni/libopus/sources/silk/float/.deps/schur_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/schur_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/schur_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/solve_LS_FLP.Plo b/jni/libopus/sources/silk/float/.deps/solve_LS_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/solve_LS_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/solve_LS_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/sort_FLP.Plo b/jni/libopus/sources/silk/float/.deps/sort_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/sort_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/sort_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/warped_autocorrelation_FLP.Plo b/jni/libopus/sources/silk/float/.deps/warped_autocorrelation_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/warped_autocorrelation_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/warped_autocorrelation_FLP.Plo
diff --git a/jni/libopus/silk/float/.deps/wrappers_FLP.Plo b/jni/libopus/sources/silk/float/.deps/wrappers_FLP.Plo
similarity index 100%
rename from jni/libopus/silk/float/.deps/wrappers_FLP.Plo
rename to jni/libopus/sources/silk/float/.deps/wrappers_FLP.Plo
diff --git a/jni/libopus/silk/float/.dirstamp b/jni/libopus/sources/silk/float/.dirstamp
similarity index 100%
rename from jni/libopus/silk/float/.dirstamp
rename to jni/libopus/sources/silk/float/.dirstamp
diff --git a/jni/libopus/silk/float/LPC_analysis_filter_FLP.c b/jni/libopus/sources/silk/float/LPC_analysis_filter_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/LPC_analysis_filter_FLP.c
rename to jni/libopus/sources/silk/float/LPC_analysis_filter_FLP.c
diff --git a/jni/libopus/silk/float/LPC_inv_pred_gain_FLP.c b/jni/libopus/sources/silk/float/LPC_inv_pred_gain_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/LPC_inv_pred_gain_FLP.c
rename to jni/libopus/sources/silk/float/LPC_inv_pred_gain_FLP.c
diff --git a/jni/libopus/silk/float/LTP_analysis_filter_FLP.c b/jni/libopus/sources/silk/float/LTP_analysis_filter_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/LTP_analysis_filter_FLP.c
rename to jni/libopus/sources/silk/float/LTP_analysis_filter_FLP.c
diff --git a/jni/libopus/silk/float/LTP_scale_ctrl_FLP.c b/jni/libopus/sources/silk/float/LTP_scale_ctrl_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/LTP_scale_ctrl_FLP.c
rename to jni/libopus/sources/silk/float/LTP_scale_ctrl_FLP.c
diff --git a/jni/libopus/silk/float/SigProc_FLP.h b/jni/libopus/sources/silk/float/SigProc_FLP.h
similarity index 100%
rename from jni/libopus/silk/float/SigProc_FLP.h
rename to jni/libopus/sources/silk/float/SigProc_FLP.h
diff --git a/jni/libopus/silk/float/apply_sine_window_FLP.c b/jni/libopus/sources/silk/float/apply_sine_window_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/apply_sine_window_FLP.c
rename to jni/libopus/sources/silk/float/apply_sine_window_FLP.c
diff --git a/jni/libopus/silk/float/autocorrelation_FLP.c b/jni/libopus/sources/silk/float/autocorrelation_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/autocorrelation_FLP.c
rename to jni/libopus/sources/silk/float/autocorrelation_FLP.c
diff --git a/jni/libopus/silk/float/burg_modified_FLP.c b/jni/libopus/sources/silk/float/burg_modified_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/burg_modified_FLP.c
rename to jni/libopus/sources/silk/float/burg_modified_FLP.c
diff --git a/jni/libopus/silk/float/bwexpander_FLP.c b/jni/libopus/sources/silk/float/bwexpander_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/bwexpander_FLP.c
rename to jni/libopus/sources/silk/float/bwexpander_FLP.c
diff --git a/jni/libopus/silk/float/corrMatrix_FLP.c b/jni/libopus/sources/silk/float/corrMatrix_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/corrMatrix_FLP.c
rename to jni/libopus/sources/silk/float/corrMatrix_FLP.c
diff --git a/jni/libopus/silk/float/encode_frame_FLP.c b/jni/libopus/sources/silk/float/encode_frame_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/encode_frame_FLP.c
rename to jni/libopus/sources/silk/float/encode_frame_FLP.c
diff --git a/jni/libopus/silk/float/energy_FLP.c b/jni/libopus/sources/silk/float/energy_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/energy_FLP.c
rename to jni/libopus/sources/silk/float/energy_FLP.c
diff --git a/jni/libopus/silk/float/find_LPC_FLP.c b/jni/libopus/sources/silk/float/find_LPC_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/find_LPC_FLP.c
rename to jni/libopus/sources/silk/float/find_LPC_FLP.c
diff --git a/jni/libopus/silk/float/find_LTP_FLP.c b/jni/libopus/sources/silk/float/find_LTP_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/find_LTP_FLP.c
rename to jni/libopus/sources/silk/float/find_LTP_FLP.c
diff --git a/jni/libopus/silk/float/find_pitch_lags_FLP.c b/jni/libopus/sources/silk/float/find_pitch_lags_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/find_pitch_lags_FLP.c
rename to jni/libopus/sources/silk/float/find_pitch_lags_FLP.c
diff --git a/jni/libopus/silk/float/find_pred_coefs_FLP.c b/jni/libopus/sources/silk/float/find_pred_coefs_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/find_pred_coefs_FLP.c
rename to jni/libopus/sources/silk/float/find_pred_coefs_FLP.c
diff --git a/jni/libopus/silk/float/inner_product_FLP.c b/jni/libopus/sources/silk/float/inner_product_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/inner_product_FLP.c
rename to jni/libopus/sources/silk/float/inner_product_FLP.c
diff --git a/jni/libopus/silk/float/k2a_FLP.c b/jni/libopus/sources/silk/float/k2a_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/k2a_FLP.c
rename to jni/libopus/sources/silk/float/k2a_FLP.c
diff --git a/jni/libopus/silk/float/levinsondurbin_FLP.c b/jni/libopus/sources/silk/float/levinsondurbin_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/levinsondurbin_FLP.c
rename to jni/libopus/sources/silk/float/levinsondurbin_FLP.c
diff --git a/jni/libopus/silk/float/main_FLP.h b/jni/libopus/sources/silk/float/main_FLP.h
similarity index 100%
rename from jni/libopus/silk/float/main_FLP.h
rename to jni/libopus/sources/silk/float/main_FLP.h
diff --git a/jni/libopus/silk/float/noise_shape_analysis_FLP.c b/jni/libopus/sources/silk/float/noise_shape_analysis_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/noise_shape_analysis_FLP.c
rename to jni/libopus/sources/silk/float/noise_shape_analysis_FLP.c
diff --git a/jni/libopus/silk/float/pitch_analysis_core_FLP.c b/jni/libopus/sources/silk/float/pitch_analysis_core_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/pitch_analysis_core_FLP.c
rename to jni/libopus/sources/silk/float/pitch_analysis_core_FLP.c
diff --git a/jni/libopus/silk/float/prefilter_FLP.c b/jni/libopus/sources/silk/float/prefilter_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/prefilter_FLP.c
rename to jni/libopus/sources/silk/float/prefilter_FLP.c
diff --git a/jni/libopus/silk/float/process_gains_FLP.c b/jni/libopus/sources/silk/float/process_gains_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/process_gains_FLP.c
rename to jni/libopus/sources/silk/float/process_gains_FLP.c
diff --git a/jni/libopus/silk/float/regularize_correlations_FLP.c b/jni/libopus/sources/silk/float/regularize_correlations_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/regularize_correlations_FLP.c
rename to jni/libopus/sources/silk/float/regularize_correlations_FLP.c
diff --git a/jni/libopus/silk/float/residual_energy_FLP.c b/jni/libopus/sources/silk/float/residual_energy_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/residual_energy_FLP.c
rename to jni/libopus/sources/silk/float/residual_energy_FLP.c
diff --git a/jni/libopus/silk/float/scale_copy_vector_FLP.c b/jni/libopus/sources/silk/float/scale_copy_vector_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/scale_copy_vector_FLP.c
rename to jni/libopus/sources/silk/float/scale_copy_vector_FLP.c
diff --git a/jni/libopus/silk/float/scale_vector_FLP.c b/jni/libopus/sources/silk/float/scale_vector_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/scale_vector_FLP.c
rename to jni/libopus/sources/silk/float/scale_vector_FLP.c
diff --git a/jni/libopus/silk/float/schur_FLP.c b/jni/libopus/sources/silk/float/schur_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/schur_FLP.c
rename to jni/libopus/sources/silk/float/schur_FLP.c
diff --git a/jni/libopus/silk/float/silk_float.vcxproj b/jni/libopus/sources/silk/float/silk_float.vcxproj
similarity index 100%
rename from jni/libopus/silk/float/silk_float.vcxproj
rename to jni/libopus/sources/silk/float/silk_float.vcxproj
diff --git a/jni/libopus/silk/float/silk_float.vcxproj.filters b/jni/libopus/sources/silk/float/silk_float.vcxproj.filters
similarity index 100%
rename from jni/libopus/silk/float/silk_float.vcxproj.filters
rename to jni/libopus/sources/silk/float/silk_float.vcxproj.filters
diff --git a/jni/libopus/silk/float/solve_LS_FLP.c b/jni/libopus/sources/silk/float/solve_LS_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/solve_LS_FLP.c
rename to jni/libopus/sources/silk/float/solve_LS_FLP.c
diff --git a/jni/libopus/silk/float/sort_FLP.c b/jni/libopus/sources/silk/float/sort_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/sort_FLP.c
rename to jni/libopus/sources/silk/float/sort_FLP.c
diff --git a/jni/libopus/silk/float/structs_FLP.h b/jni/libopus/sources/silk/float/structs_FLP.h
similarity index 100%
rename from jni/libopus/silk/float/structs_FLP.h
rename to jni/libopus/sources/silk/float/structs_FLP.h
diff --git a/jni/libopus/silk/float/warped_autocorrelation_FLP.c b/jni/libopus/sources/silk/float/warped_autocorrelation_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/warped_autocorrelation_FLP.c
rename to jni/libopus/sources/silk/float/warped_autocorrelation_FLP.c
diff --git a/jni/libopus/silk/float/wrappers_FLP.c b/jni/libopus/sources/silk/float/wrappers_FLP.c
similarity index 100%
rename from jni/libopus/silk/float/wrappers_FLP.c
rename to jni/libopus/sources/silk/float/wrappers_FLP.c
diff --git a/jni/libopus/silk/gain_quant.c b/jni/libopus/sources/silk/gain_quant.c
similarity index 100%
rename from jni/libopus/silk/gain_quant.c
rename to jni/libopus/sources/silk/gain_quant.c
diff --git a/jni/libopus/silk/init_decoder.c b/jni/libopus/sources/silk/init_decoder.c
similarity index 100%
rename from jni/libopus/silk/init_decoder.c
rename to jni/libopus/sources/silk/init_decoder.c
diff --git a/jni/libopus/silk/init_encoder.c b/jni/libopus/sources/silk/init_encoder.c
similarity index 100%
rename from jni/libopus/silk/init_encoder.c
rename to jni/libopus/sources/silk/init_encoder.c
diff --git a/jni/libopus/silk/inner_prod_aligned.c b/jni/libopus/sources/silk/inner_prod_aligned.c
similarity index 100%
rename from jni/libopus/silk/inner_prod_aligned.c
rename to jni/libopus/sources/silk/inner_prod_aligned.c
diff --git a/jni/libopus/silk/interpolate.c b/jni/libopus/sources/silk/interpolate.c
similarity index 100%
rename from jni/libopus/silk/interpolate.c
rename to jni/libopus/sources/silk/interpolate.c
diff --git a/jni/libopus/silk/lin2log.c b/jni/libopus/sources/silk/lin2log.c
similarity index 100%
rename from jni/libopus/silk/lin2log.c
rename to jni/libopus/sources/silk/lin2log.c
diff --git a/jni/libopus/silk/log2lin.c b/jni/libopus/sources/silk/log2lin.c
similarity index 100%
rename from jni/libopus/silk/log2lin.c
rename to jni/libopus/sources/silk/log2lin.c
diff --git a/jni/libopus/silk/macros.h b/jni/libopus/sources/silk/macros.h
similarity index 100%
rename from jni/libopus/silk/macros.h
rename to jni/libopus/sources/silk/macros.h
diff --git a/jni/libopus/silk/main.h b/jni/libopus/sources/silk/main.h
similarity index 100%
rename from jni/libopus/silk/main.h
rename to jni/libopus/sources/silk/main.h
diff --git a/jni/libopus/silk/pitch_est_defines.h b/jni/libopus/sources/silk/pitch_est_defines.h
similarity index 100%
rename from jni/libopus/silk/pitch_est_defines.h
rename to jni/libopus/sources/silk/pitch_est_defines.h
diff --git a/jni/libopus/silk/pitch_est_tables.c b/jni/libopus/sources/silk/pitch_est_tables.c
similarity index 100%
rename from jni/libopus/silk/pitch_est_tables.c
rename to jni/libopus/sources/silk/pitch_est_tables.c
diff --git a/jni/libopus/silk/process_NLSFs.c b/jni/libopus/sources/silk/process_NLSFs.c
similarity index 100%
rename from jni/libopus/silk/process_NLSFs.c
rename to jni/libopus/sources/silk/process_NLSFs.c
diff --git a/jni/libopus/silk/quant_LTP_gains.c b/jni/libopus/sources/silk/quant_LTP_gains.c
similarity index 100%
rename from jni/libopus/silk/quant_LTP_gains.c
rename to jni/libopus/sources/silk/quant_LTP_gains.c
diff --git a/jni/libopus/silk/resampler.c b/jni/libopus/sources/silk/resampler.c
similarity index 100%
rename from jni/libopus/silk/resampler.c
rename to jni/libopus/sources/silk/resampler.c
diff --git a/jni/libopus/silk/resampler_down2.c b/jni/libopus/sources/silk/resampler_down2.c
similarity index 100%
rename from jni/libopus/silk/resampler_down2.c
rename to jni/libopus/sources/silk/resampler_down2.c
diff --git a/jni/libopus/silk/resampler_down2_3.c b/jni/libopus/sources/silk/resampler_down2_3.c
similarity index 100%
rename from jni/libopus/silk/resampler_down2_3.c
rename to jni/libopus/sources/silk/resampler_down2_3.c
diff --git a/jni/libopus/silk/resampler_private.h b/jni/libopus/sources/silk/resampler_private.h
similarity index 100%
rename from jni/libopus/silk/resampler_private.h
rename to jni/libopus/sources/silk/resampler_private.h
diff --git a/jni/libopus/silk/resampler_private_AR2.c b/jni/libopus/sources/silk/resampler_private_AR2.c
similarity index 100%
rename from jni/libopus/silk/resampler_private_AR2.c
rename to jni/libopus/sources/silk/resampler_private_AR2.c
diff --git a/jni/libopus/silk/resampler_private_IIR_FIR.c b/jni/libopus/sources/silk/resampler_private_IIR_FIR.c
similarity index 100%
rename from jni/libopus/silk/resampler_private_IIR_FIR.c
rename to jni/libopus/sources/silk/resampler_private_IIR_FIR.c
diff --git a/jni/libopus/silk/resampler_private_down_FIR.c b/jni/libopus/sources/silk/resampler_private_down_FIR.c
similarity index 100%
rename from jni/libopus/silk/resampler_private_down_FIR.c
rename to jni/libopus/sources/silk/resampler_private_down_FIR.c
diff --git a/jni/libopus/silk/resampler_private_up2_HQ.c b/jni/libopus/sources/silk/resampler_private_up2_HQ.c
similarity index 100%
rename from jni/libopus/silk/resampler_private_up2_HQ.c
rename to jni/libopus/sources/silk/resampler_private_up2_HQ.c
diff --git a/jni/libopus/silk/resampler_rom.c b/jni/libopus/sources/silk/resampler_rom.c
similarity index 100%
rename from jni/libopus/silk/resampler_rom.c
rename to jni/libopus/sources/silk/resampler_rom.c
diff --git a/jni/libopus/silk/resampler_rom.h b/jni/libopus/sources/silk/resampler_rom.h
similarity index 100%
rename from jni/libopus/silk/resampler_rom.h
rename to jni/libopus/sources/silk/resampler_rom.h
diff --git a/jni/libopus/silk/resampler_structs.h b/jni/libopus/sources/silk/resampler_structs.h
similarity index 100%
rename from jni/libopus/silk/resampler_structs.h
rename to jni/libopus/sources/silk/resampler_structs.h
diff --git a/jni/libopus/silk/shell_coder.c b/jni/libopus/sources/silk/shell_coder.c
similarity index 100%
rename from jni/libopus/silk/shell_coder.c
rename to jni/libopus/sources/silk/shell_coder.c
diff --git a/jni/libopus/silk/sigm_Q15.c b/jni/libopus/sources/silk/sigm_Q15.c
similarity index 100%
rename from jni/libopus/silk/sigm_Q15.c
rename to jni/libopus/sources/silk/sigm_Q15.c
diff --git a/jni/libopus/silk/silk_common.vcxproj b/jni/libopus/sources/silk/silk_common.vcxproj
similarity index 100%
rename from jni/libopus/silk/silk_common.vcxproj
rename to jni/libopus/sources/silk/silk_common.vcxproj
diff --git a/jni/libopus/silk/silk_common.vcxproj.filters b/jni/libopus/sources/silk/silk_common.vcxproj.filters
similarity index 100%
rename from jni/libopus/silk/silk_common.vcxproj.filters
rename to jni/libopus/sources/silk/silk_common.vcxproj.filters
diff --git a/jni/libopus/silk/sort.c b/jni/libopus/sources/silk/sort.c
similarity index 100%
rename from jni/libopus/silk/sort.c
rename to jni/libopus/sources/silk/sort.c
diff --git a/jni/libopus/silk/stereo_LR_to_MS.c b/jni/libopus/sources/silk/stereo_LR_to_MS.c
similarity index 100%
rename from jni/libopus/silk/stereo_LR_to_MS.c
rename to jni/libopus/sources/silk/stereo_LR_to_MS.c
diff --git a/jni/libopus/silk/stereo_MS_to_LR.c b/jni/libopus/sources/silk/stereo_MS_to_LR.c
similarity index 100%
rename from jni/libopus/silk/stereo_MS_to_LR.c
rename to jni/libopus/sources/silk/stereo_MS_to_LR.c
diff --git a/jni/libopus/silk/stereo_decode_pred.c b/jni/libopus/sources/silk/stereo_decode_pred.c
similarity index 100%
rename from jni/libopus/silk/stereo_decode_pred.c
rename to jni/libopus/sources/silk/stereo_decode_pred.c
diff --git a/jni/libopus/silk/stereo_encode_pred.c b/jni/libopus/sources/silk/stereo_encode_pred.c
similarity index 100%
rename from jni/libopus/silk/stereo_encode_pred.c
rename to jni/libopus/sources/silk/stereo_encode_pred.c
diff --git a/jni/libopus/silk/stereo_find_predictor.c b/jni/libopus/sources/silk/stereo_find_predictor.c
similarity index 100%
rename from jni/libopus/silk/stereo_find_predictor.c
rename to jni/libopus/sources/silk/stereo_find_predictor.c
diff --git a/jni/libopus/silk/stereo_quant_pred.c b/jni/libopus/sources/silk/stereo_quant_pred.c
similarity index 100%
rename from jni/libopus/silk/stereo_quant_pred.c
rename to jni/libopus/sources/silk/stereo_quant_pred.c
diff --git a/jni/libopus/silk/structs.h b/jni/libopus/sources/silk/structs.h
similarity index 100%
rename from jni/libopus/silk/structs.h
rename to jni/libopus/sources/silk/structs.h
diff --git a/jni/libopus/silk/sum_sqr_shift.c b/jni/libopus/sources/silk/sum_sqr_shift.c
similarity index 100%
rename from jni/libopus/silk/sum_sqr_shift.c
rename to jni/libopus/sources/silk/sum_sqr_shift.c
diff --git a/jni/libopus/silk/table_LSF_cos.c b/jni/libopus/sources/silk/table_LSF_cos.c
similarity index 100%
rename from jni/libopus/silk/table_LSF_cos.c
rename to jni/libopus/sources/silk/table_LSF_cos.c
diff --git a/jni/libopus/silk/tables.h b/jni/libopus/sources/silk/tables.h
similarity index 100%
rename from jni/libopus/silk/tables.h
rename to jni/libopus/sources/silk/tables.h
diff --git a/jni/libopus/silk/tables_LTP.c b/jni/libopus/sources/silk/tables_LTP.c
similarity index 100%
rename from jni/libopus/silk/tables_LTP.c
rename to jni/libopus/sources/silk/tables_LTP.c
diff --git a/jni/libopus/silk/tables_NLSF_CB_NB_MB.c b/jni/libopus/sources/silk/tables_NLSF_CB_NB_MB.c
similarity index 100%
rename from jni/libopus/silk/tables_NLSF_CB_NB_MB.c
rename to jni/libopus/sources/silk/tables_NLSF_CB_NB_MB.c
diff --git a/jni/libopus/silk/tables_NLSF_CB_WB.c b/jni/libopus/sources/silk/tables_NLSF_CB_WB.c
similarity index 100%
rename from jni/libopus/silk/tables_NLSF_CB_WB.c
rename to jni/libopus/sources/silk/tables_NLSF_CB_WB.c
diff --git a/jni/libopus/silk/tables_gain.c b/jni/libopus/sources/silk/tables_gain.c
similarity index 100%
rename from jni/libopus/silk/tables_gain.c
rename to jni/libopus/sources/silk/tables_gain.c
diff --git a/jni/libopus/silk/tables_other.c b/jni/libopus/sources/silk/tables_other.c
similarity index 100%
rename from jni/libopus/silk/tables_other.c
rename to jni/libopus/sources/silk/tables_other.c
diff --git a/jni/libopus/silk/tables_pitch_lag.c b/jni/libopus/sources/silk/tables_pitch_lag.c
similarity index 100%
rename from jni/libopus/silk/tables_pitch_lag.c
rename to jni/libopus/sources/silk/tables_pitch_lag.c
diff --git a/jni/libopus/silk/tables_pulses_per_block.c b/jni/libopus/sources/silk/tables_pulses_per_block.c
similarity index 100%
rename from jni/libopus/silk/tables_pulses_per_block.c
rename to jni/libopus/sources/silk/tables_pulses_per_block.c
diff --git a/jni/libopus/silk/tuning_parameters.h b/jni/libopus/sources/silk/tuning_parameters.h
similarity index 100%
rename from jni/libopus/silk/tuning_parameters.h
rename to jni/libopus/sources/silk/tuning_parameters.h
diff --git a/jni/libopus/silk/typedef.h b/jni/libopus/sources/silk/typedef.h
similarity index 100%
rename from jni/libopus/silk/typedef.h
rename to jni/libopus/sources/silk/typedef.h
diff --git a/jni/libopus/silk_headers.mk b/jni/libopus/sources/silk_headers.mk
similarity index 100%
rename from jni/libopus/silk_headers.mk
rename to jni/libopus/sources/silk_headers.mk
diff --git a/jni/libopus/silk_sources.mk b/jni/libopus/sources/silk_sources.mk
similarity index 100%
rename from jni/libopus/silk_sources.mk
rename to jni/libopus/sources/silk_sources.mk
diff --git a/jni/libopus/src/.deps/.dirstamp b/jni/libopus/sources/src/.deps/.dirstamp
similarity index 100%
rename from jni/libopus/src/.deps/.dirstamp
rename to jni/libopus/sources/src/.deps/.dirstamp
diff --git a/jni/libopus/src/.deps/opus.Plo b/jni/libopus/sources/src/.deps/opus.Plo
similarity index 100%
rename from jni/libopus/src/.deps/opus.Plo
rename to jni/libopus/sources/src/.deps/opus.Plo
diff --git a/jni/libopus/src/.deps/opus_compare.Po b/jni/libopus/sources/src/.deps/opus_compare.Po
similarity index 100%
rename from jni/libopus/src/.deps/opus_compare.Po
rename to jni/libopus/sources/src/.deps/opus_compare.Po
diff --git a/jni/libopus/src/.deps/opus_decoder.Plo b/jni/libopus/sources/src/.deps/opus_decoder.Plo
similarity index 100%
rename from jni/libopus/src/.deps/opus_decoder.Plo
rename to jni/libopus/sources/src/.deps/opus_decoder.Plo
diff --git a/jni/libopus/src/.deps/opus_demo.Po b/jni/libopus/sources/src/.deps/opus_demo.Po
similarity index 100%
rename from jni/libopus/src/.deps/opus_demo.Po
rename to jni/libopus/sources/src/.deps/opus_demo.Po
diff --git a/jni/libopus/src/.deps/opus_encoder.Plo b/jni/libopus/sources/src/.deps/opus_encoder.Plo
similarity index 100%
rename from jni/libopus/src/.deps/opus_encoder.Plo
rename to jni/libopus/sources/src/.deps/opus_encoder.Plo
diff --git a/jni/libopus/src/.deps/opus_multistream.Plo b/jni/libopus/sources/src/.deps/opus_multistream.Plo
similarity index 100%
rename from jni/libopus/src/.deps/opus_multistream.Plo
rename to jni/libopus/sources/src/.deps/opus_multistream.Plo
diff --git a/jni/libopus/src/.deps/repacketizer.Plo b/jni/libopus/sources/src/.deps/repacketizer.Plo
similarity index 100%
rename from jni/libopus/src/.deps/repacketizer.Plo
rename to jni/libopus/sources/src/.deps/repacketizer.Plo
diff --git a/jni/libopus/src/.deps/repacketizer_demo.Po b/jni/libopus/sources/src/.deps/repacketizer_demo.Po
similarity index 100%
rename from jni/libopus/src/.deps/repacketizer_demo.Po
rename to jni/libopus/sources/src/.deps/repacketizer_demo.Po
diff --git a/jni/libopus/src/.dirstamp b/jni/libopus/sources/src/.dirstamp
similarity index 100%
rename from jni/libopus/src/.dirstamp
rename to jni/libopus/sources/src/.dirstamp
diff --git a/jni/libopus/src/opus.c b/jni/libopus/sources/src/opus.c
similarity index 100%
rename from jni/libopus/src/opus.c
rename to jni/libopus/sources/src/opus.c
diff --git a/jni/libopus/src/opus.vcxproj b/jni/libopus/sources/src/opus.vcxproj
similarity index 100%
rename from jni/libopus/src/opus.vcxproj
rename to jni/libopus/sources/src/opus.vcxproj
diff --git a/jni/libopus/src/opus.vcxproj.filters b/jni/libopus/sources/src/opus.vcxproj.filters
similarity index 100%
rename from jni/libopus/src/opus.vcxproj.filters
rename to jni/libopus/sources/src/opus.vcxproj.filters
diff --git a/jni/libopus/src/opus_compare.c b/jni/libopus/sources/src/opus_compare.c
similarity index 100%
rename from jni/libopus/src/opus_compare.c
rename to jni/libopus/sources/src/opus_compare.c
diff --git a/jni/libopus/src/opus_decoder.c b/jni/libopus/sources/src/opus_decoder.c
similarity index 100%
rename from jni/libopus/src/opus_decoder.c
rename to jni/libopus/sources/src/opus_decoder.c
diff --git a/jni/libopus/src/opus_demo.c b/jni/libopus/sources/src/opus_demo.c
similarity index 100%
rename from jni/libopus/src/opus_demo.c
rename to jni/libopus/sources/src/opus_demo.c
diff --git a/jni/libopus/src/opus_demo.vcxproj b/jni/libopus/sources/src/opus_demo.vcxproj
similarity index 100%
rename from jni/libopus/src/opus_demo.vcxproj
rename to jni/libopus/sources/src/opus_demo.vcxproj
diff --git a/jni/libopus/src/opus_demo.vcxproj.filters b/jni/libopus/sources/src/opus_demo.vcxproj.filters
similarity index 100%
rename from jni/libopus/src/opus_demo.vcxproj.filters
rename to jni/libopus/sources/src/opus_demo.vcxproj.filters
diff --git a/jni/libopus/src/opus_encoder.c b/jni/libopus/sources/src/opus_encoder.c
similarity index 100%
rename from jni/libopus/src/opus_encoder.c
rename to jni/libopus/sources/src/opus_encoder.c
diff --git a/jni/libopus/src/opus_multistream.c b/jni/libopus/sources/src/opus_multistream.c
similarity index 100%
rename from jni/libopus/src/opus_multistream.c
rename to jni/libopus/sources/src/opus_multistream.c
diff --git a/jni/libopus/src/opus_private.h b/jni/libopus/sources/src/opus_private.h
similarity index 100%
rename from jni/libopus/src/opus_private.h
rename to jni/libopus/sources/src/opus_private.h
diff --git a/jni/libopus/src/repacketizer.c b/jni/libopus/sources/src/repacketizer.c
similarity index 100%
rename from jni/libopus/src/repacketizer.c
rename to jni/libopus/sources/src/repacketizer.c
diff --git a/jni/libopus/src/repacketizer_demo.c b/jni/libopus/sources/src/repacketizer_demo.c
similarity index 100%
rename from jni/libopus/src/repacketizer_demo.c
rename to jni/libopus/sources/src/repacketizer_demo.c
diff --git a/jni/libopus/stamp-h1 b/jni/libopus/sources/stamp-h1
similarity index 100%
rename from jni/libopus/stamp-h1
rename to jni/libopus/sources/stamp-h1
diff --git a/jni/libopus/tests/.deps/.dirstamp b/jni/libopus/sources/tests/.deps/.dirstamp
similarity index 100%
rename from jni/libopus/tests/.deps/.dirstamp
rename to jni/libopus/sources/tests/.deps/.dirstamp
diff --git a/jni/libopus/tests/.deps/test_opus_api.Po b/jni/libopus/sources/tests/.deps/test_opus_api.Po
similarity index 100%
rename from jni/libopus/tests/.deps/test_opus_api.Po
rename to jni/libopus/sources/tests/.deps/test_opus_api.Po
diff --git a/jni/libopus/tests/.deps/test_opus_decode.Po b/jni/libopus/sources/tests/.deps/test_opus_decode.Po
similarity index 100%
rename from jni/libopus/tests/.deps/test_opus_decode.Po
rename to jni/libopus/sources/tests/.deps/test_opus_decode.Po
diff --git a/jni/libopus/tests/.deps/test_opus_encode.Po b/jni/libopus/sources/tests/.deps/test_opus_encode.Po
similarity index 100%
rename from jni/libopus/tests/.deps/test_opus_encode.Po
rename to jni/libopus/sources/tests/.deps/test_opus_encode.Po
diff --git a/jni/libopus/tests/.dirstamp b/jni/libopus/sources/tests/.dirstamp
similarity index 100%
rename from jni/libopus/tests/.dirstamp
rename to jni/libopus/sources/tests/.dirstamp
diff --git a/jni/libopus/tests/run_vectors.sh b/jni/libopus/sources/tests/run_vectors.sh
similarity index 100%
rename from jni/libopus/tests/run_vectors.sh
rename to jni/libopus/sources/tests/run_vectors.sh
diff --git a/jni/libopus/tests/test_opus_api.c b/jni/libopus/sources/tests/test_opus_api.c
similarity index 100%
rename from jni/libopus/tests/test_opus_api.c
rename to jni/libopus/sources/tests/test_opus_api.c
diff --git a/jni/libopus/tests/test_opus_api.vcxproj b/jni/libopus/sources/tests/test_opus_api.vcxproj
similarity index 100%
rename from jni/libopus/tests/test_opus_api.vcxproj
rename to jni/libopus/sources/tests/test_opus_api.vcxproj
diff --git a/jni/libopus/tests/test_opus_api.vcxproj.filters b/jni/libopus/sources/tests/test_opus_api.vcxproj.filters
similarity index 100%
rename from jni/libopus/tests/test_opus_api.vcxproj.filters
rename to jni/libopus/sources/tests/test_opus_api.vcxproj.filters
diff --git a/jni/libopus/tests/test_opus_common.h b/jni/libopus/sources/tests/test_opus_common.h
similarity index 100%
rename from jni/libopus/tests/test_opus_common.h
rename to jni/libopus/sources/tests/test_opus_common.h
diff --git a/jni/libopus/tests/test_opus_decode.c b/jni/libopus/sources/tests/test_opus_decode.c
similarity index 100%
rename from jni/libopus/tests/test_opus_decode.c
rename to jni/libopus/sources/tests/test_opus_decode.c
diff --git a/jni/libopus/tests/test_opus_decode.vcxproj b/jni/libopus/sources/tests/test_opus_decode.vcxproj
similarity index 100%
rename from jni/libopus/tests/test_opus_decode.vcxproj
rename to jni/libopus/sources/tests/test_opus_decode.vcxproj
diff --git a/jni/libopus/tests/test_opus_decode.vcxproj.filters b/jni/libopus/sources/tests/test_opus_decode.vcxproj.filters
similarity index 100%
rename from jni/libopus/tests/test_opus_decode.vcxproj.filters
rename to jni/libopus/sources/tests/test_opus_decode.vcxproj.filters
diff --git a/jni/libopus/tests/test_opus_encode.c b/jni/libopus/sources/tests/test_opus_encode.c
similarity index 100%
rename from jni/libopus/tests/test_opus_encode.c
rename to jni/libopus/sources/tests/test_opus_encode.c
diff --git a/jni/libopus/tests/test_opus_encode.vcxproj b/jni/libopus/sources/tests/test_opus_encode.vcxproj
similarity index 100%
rename from jni/libopus/tests/test_opus_encode.vcxproj
rename to jni/libopus/sources/tests/test_opus_encode.vcxproj
diff --git a/jni/libopus/tests/test_opus_encode.vcxproj.filters b/jni/libopus/sources/tests/test_opus_encode.vcxproj.filters
similarity index 100%
rename from jni/libopus/tests/test_opus_encode.vcxproj.filters
rename to jni/libopus/sources/tests/test_opus_encode.vcxproj.filters
diff --git a/jni/libopus/version.mk b/jni/libopus/sources/version.mk
similarity index 100%
rename from jni/libopus/version.mk
rename to jni/libopus/sources/version.mk
diff --git a/jni/libopus/win32/config.h b/jni/libopus/sources/win32/config.h
similarity index 100%
rename from jni/libopus/win32/config.h
rename to jni/libopus/sources/win32/config.h
diff --git a/jni/libopus/win32/genversion.bat b/jni/libopus/sources/win32/genversion.bat
similarity index 100%
rename from jni/libopus/win32/genversion.bat
rename to jni/libopus/sources/win32/genversion.bat
diff --git a/jni/libpcre/Android.mk b/jni/libpcre/Android.mk
new file mode 100644
index 0000000..6fd64cf
--- /dev/null
+++ b/jni/libpcre/Android.mk
@@ -0,0 +1,30 @@
+include $(CLEAR_VARS)
+
+MY_PCRE = libpcre/sources
+
+LOCAL_MODULE := libpcre
+LOCAL_CFLAGS := -DHAVE_CONFIG_H
+
+LOCAL_SRC_FILES :=  \
+  $(MY_PCRE)/pcre_compile.c \
+  $(MY_PCRE)/pcre_chartables.c \
+  $(MY_PCRE)/pcre_config.c \
+  $(MY_PCRE)/pcre_dfa_exec.c \
+  $(MY_PCRE)/pcre_exec.c \
+  $(MY_PCRE)/pcre_fullinfo.c \
+  $(MY_PCRE)/pcre_get.c \
+  $(MY_PCRE)/pcre_globals.c \
+  $(MY_PCRE)/pcre_info.c \
+  $(MY_PCRE)/pcre_maketables.c \
+  $(MY_PCRE)/pcre_newline.c \
+  $(MY_PCRE)/pcre_ord2utf8.c \
+  $(MY_PCRE)/pcre_refcount.c \
+  $(MY_PCRE)/pcre_study.c \
+  $(MY_PCRE)/pcre_tables.c \
+  $(MY_PCRE)/pcre_try_flipped.c \
+  $(MY_PCRE)/pcre_ucd.c \
+  $(MY_PCRE)/pcre_valid_utf8.c \
+  $(MY_PCRE)/pcre_version.c \
+  $(MY_PCRE)/pcre_xclass.c
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libpcre/132html b/jni/libpcre/sources/132html
similarity index 100%
rename from jni/libpcre/132html
rename to jni/libpcre/sources/132html
diff --git a/jni/libpcre/AUTHORS b/jni/libpcre/sources/AUTHORS
similarity index 100%
rename from jni/libpcre/AUTHORS
rename to jni/libpcre/sources/AUTHORS
diff --git a/jni/libpcre/CMakeLists.txt b/jni/libpcre/sources/CMakeLists.txt
similarity index 100%
rename from jni/libpcre/CMakeLists.txt
rename to jni/libpcre/sources/CMakeLists.txt
diff --git a/jni/libpcre/COPYING b/jni/libpcre/sources/COPYING
similarity index 100%
rename from jni/libpcre/COPYING
rename to jni/libpcre/sources/COPYING
diff --git a/jni/libpcre/ChangeLog b/jni/libpcre/sources/ChangeLog
similarity index 100%
rename from jni/libpcre/ChangeLog
rename to jni/libpcre/sources/ChangeLog
diff --git a/jni/libpcre/CheckMan b/jni/libpcre/sources/CheckMan
similarity index 100%
rename from jni/libpcre/CheckMan
rename to jni/libpcre/sources/CheckMan
diff --git a/jni/libpcre/CleanTxt b/jni/libpcre/sources/CleanTxt
similarity index 100%
rename from jni/libpcre/CleanTxt
rename to jni/libpcre/sources/CleanTxt
diff --git a/jni/libpcre/Detrail b/jni/libpcre/sources/Detrail
similarity index 100%
rename from jni/libpcre/Detrail
rename to jni/libpcre/sources/Detrail
diff --git a/jni/libpcre/HACKING b/jni/libpcre/sources/HACKING
similarity index 100%
rename from jni/libpcre/HACKING
rename to jni/libpcre/sources/HACKING
diff --git a/jni/libpcre/INSTALL b/jni/libpcre/sources/INSTALL
similarity index 100%
rename from jni/libpcre/INSTALL
rename to jni/libpcre/sources/INSTALL
diff --git a/jni/libpcre/LICENCE b/jni/libpcre/sources/LICENCE
similarity index 100%
rename from jni/libpcre/LICENCE
rename to jni/libpcre/sources/LICENCE
diff --git a/jni/libpcre/Makefile b/jni/libpcre/sources/Makefile
similarity index 100%
rename from jni/libpcre/Makefile
rename to jni/libpcre/sources/Makefile
diff --git a/jni/libpcre/Makefile.am b/jni/libpcre/sources/Makefile.am
similarity index 100%
rename from jni/libpcre/Makefile.am
rename to jni/libpcre/sources/Makefile.am
diff --git a/jni/libpcre/Makefile.in b/jni/libpcre/sources/Makefile.in
similarity index 100%
rename from jni/libpcre/Makefile.in
rename to jni/libpcre/sources/Makefile.in
diff --git a/jni/libpcre/NEWS b/jni/libpcre/sources/NEWS
similarity index 100%
rename from jni/libpcre/NEWS
rename to jni/libpcre/sources/NEWS
diff --git a/jni/libpcre/NON-UNIX-USE b/jni/libpcre/sources/NON-UNIX-USE
similarity index 100%
rename from jni/libpcre/NON-UNIX-USE
rename to jni/libpcre/sources/NON-UNIX-USE
diff --git a/jni/libpcre/PrepareRelease b/jni/libpcre/sources/PrepareRelease
similarity index 100%
rename from jni/libpcre/PrepareRelease
rename to jni/libpcre/sources/PrepareRelease
diff --git a/jni/libpcre/README b/jni/libpcre/sources/README
similarity index 100%
rename from jni/libpcre/README
rename to jni/libpcre/sources/README
diff --git a/jni/libpcre/RunGrepTest b/jni/libpcre/sources/RunGrepTest
similarity index 100%
rename from jni/libpcre/RunGrepTest
rename to jni/libpcre/sources/RunGrepTest
diff --git a/jni/libpcre/RunTest b/jni/libpcre/sources/RunTest
similarity index 100%
rename from jni/libpcre/RunTest
rename to jni/libpcre/sources/RunTest
diff --git a/jni/libpcre/RunTest.bat b/jni/libpcre/sources/RunTest.bat
similarity index 100%
rename from jni/libpcre/RunTest.bat
rename to jni/libpcre/sources/RunTest.bat
diff --git a/jni/libpcre/aclocal.m4 b/jni/libpcre/sources/aclocal.m4
similarity index 100%
rename from jni/libpcre/aclocal.m4
rename to jni/libpcre/sources/aclocal.m4
diff --git a/jni/libpcre/cmake/COPYING-CMAKE-SCRIPTS b/jni/libpcre/sources/cmake/COPYING-CMAKE-SCRIPTS
similarity index 100%
rename from jni/libpcre/cmake/COPYING-CMAKE-SCRIPTS
rename to jni/libpcre/sources/cmake/COPYING-CMAKE-SCRIPTS
diff --git a/jni/libpcre/cmake/FindPackageHandleStandardArgs.cmake b/jni/libpcre/sources/cmake/FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from jni/libpcre/cmake/FindPackageHandleStandardArgs.cmake
rename to jni/libpcre/sources/cmake/FindPackageHandleStandardArgs.cmake
diff --git a/jni/libpcre/cmake/FindReadline.cmake b/jni/libpcre/sources/cmake/FindReadline.cmake
similarity index 100%
rename from jni/libpcre/cmake/FindReadline.cmake
rename to jni/libpcre/sources/cmake/FindReadline.cmake
diff --git a/jni/libpcre/config-cmake.h.in b/jni/libpcre/sources/config-cmake.h.in
similarity index 100%
rename from jni/libpcre/config-cmake.h.in
rename to jni/libpcre/sources/config-cmake.h.in
diff --git a/jni/libpcre/config.guess b/jni/libpcre/sources/config.guess
similarity index 100%
rename from jni/libpcre/config.guess
rename to jni/libpcre/sources/config.guess
diff --git a/jni/libpcre/config.h b/jni/libpcre/sources/config.h
similarity index 100%
rename from jni/libpcre/config.h
rename to jni/libpcre/sources/config.h
diff --git a/jni/libpcre/config.h.generic b/jni/libpcre/sources/config.h.generic
similarity index 100%
rename from jni/libpcre/config.h.generic
rename to jni/libpcre/sources/config.h.generic
diff --git a/jni/libpcre/config.h.in b/jni/libpcre/sources/config.h.in
similarity index 100%
rename from jni/libpcre/config.h.in
rename to jni/libpcre/sources/config.h.in
diff --git a/jni/libpcre/config.log b/jni/libpcre/sources/config.log
similarity index 100%
rename from jni/libpcre/config.log
rename to jni/libpcre/sources/config.log
diff --git a/jni/libpcre/config.status b/jni/libpcre/sources/config.status
similarity index 100%
rename from jni/libpcre/config.status
rename to jni/libpcre/sources/config.status
diff --git a/jni/libpcre/config.sub b/jni/libpcre/sources/config.sub
similarity index 100%
rename from jni/libpcre/config.sub
rename to jni/libpcre/sources/config.sub
diff --git a/jni/libpcre/configure b/jni/libpcre/sources/configure
similarity index 100%
rename from jni/libpcre/configure
rename to jni/libpcre/sources/configure
diff --git a/jni/libpcre/configure.ac b/jni/libpcre/sources/configure.ac
similarity index 100%
rename from jni/libpcre/configure.ac
rename to jni/libpcre/sources/configure.ac
diff --git a/jni/libpcre/depcomp b/jni/libpcre/sources/depcomp
similarity index 100%
rename from jni/libpcre/depcomp
rename to jni/libpcre/sources/depcomp
diff --git a/jni/libpcre/dftables.c b/jni/libpcre/sources/dftables.c
similarity index 100%
rename from jni/libpcre/dftables.c
rename to jni/libpcre/sources/dftables.c
diff --git a/jni/libpcre/doc/html/index.html b/jni/libpcre/sources/doc/html/index.html
similarity index 100%
rename from jni/libpcre/doc/html/index.html
rename to jni/libpcre/sources/doc/html/index.html
diff --git a/jni/libpcre/doc/html/pcre-config.html b/jni/libpcre/sources/doc/html/pcre-config.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre-config.html
rename to jni/libpcre/sources/doc/html/pcre-config.html
diff --git a/jni/libpcre/doc/html/pcre.html b/jni/libpcre/sources/doc/html/pcre.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre.html
rename to jni/libpcre/sources/doc/html/pcre.html
diff --git a/jni/libpcre/doc/html/pcre_assign_jit_stack.html b/jni/libpcre/sources/doc/html/pcre_assign_jit_stack.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_assign_jit_stack.html
rename to jni/libpcre/sources/doc/html/pcre_assign_jit_stack.html
diff --git a/jni/libpcre/doc/html/pcre_compile.html b/jni/libpcre/sources/doc/html/pcre_compile.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_compile.html
rename to jni/libpcre/sources/doc/html/pcre_compile.html
diff --git a/jni/libpcre/doc/html/pcre_compile2.html b/jni/libpcre/sources/doc/html/pcre_compile2.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_compile2.html
rename to jni/libpcre/sources/doc/html/pcre_compile2.html
diff --git a/jni/libpcre/doc/html/pcre_config.html b/jni/libpcre/sources/doc/html/pcre_config.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_config.html
rename to jni/libpcre/sources/doc/html/pcre_config.html
diff --git a/jni/libpcre/doc/html/pcre_copy_named_substring.html b/jni/libpcre/sources/doc/html/pcre_copy_named_substring.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_copy_named_substring.html
rename to jni/libpcre/sources/doc/html/pcre_copy_named_substring.html
diff --git a/jni/libpcre/doc/html/pcre_copy_substring.html b/jni/libpcre/sources/doc/html/pcre_copy_substring.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_copy_substring.html
rename to jni/libpcre/sources/doc/html/pcre_copy_substring.html
diff --git a/jni/libpcre/doc/html/pcre_dfa_exec.html b/jni/libpcre/sources/doc/html/pcre_dfa_exec.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_dfa_exec.html
rename to jni/libpcre/sources/doc/html/pcre_dfa_exec.html
diff --git a/jni/libpcre/doc/html/pcre_exec.html b/jni/libpcre/sources/doc/html/pcre_exec.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_exec.html
rename to jni/libpcre/sources/doc/html/pcre_exec.html
diff --git a/jni/libpcre/doc/html/pcre_free_study.html b/jni/libpcre/sources/doc/html/pcre_free_study.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_free_study.html
rename to jni/libpcre/sources/doc/html/pcre_free_study.html
diff --git a/jni/libpcre/doc/html/pcre_free_substring.html b/jni/libpcre/sources/doc/html/pcre_free_substring.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_free_substring.html
rename to jni/libpcre/sources/doc/html/pcre_free_substring.html
diff --git a/jni/libpcre/doc/html/pcre_free_substring_list.html b/jni/libpcre/sources/doc/html/pcre_free_substring_list.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_free_substring_list.html
rename to jni/libpcre/sources/doc/html/pcre_free_substring_list.html
diff --git a/jni/libpcre/doc/html/pcre_fullinfo.html b/jni/libpcre/sources/doc/html/pcre_fullinfo.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_fullinfo.html
rename to jni/libpcre/sources/doc/html/pcre_fullinfo.html
diff --git a/jni/libpcre/doc/html/pcre_get_named_substring.html b/jni/libpcre/sources/doc/html/pcre_get_named_substring.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_get_named_substring.html
rename to jni/libpcre/sources/doc/html/pcre_get_named_substring.html
diff --git a/jni/libpcre/doc/html/pcre_get_stringnumber.html b/jni/libpcre/sources/doc/html/pcre_get_stringnumber.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_get_stringnumber.html
rename to jni/libpcre/sources/doc/html/pcre_get_stringnumber.html
diff --git a/jni/libpcre/doc/html/pcre_get_stringtable_entries.html b/jni/libpcre/sources/doc/html/pcre_get_stringtable_entries.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_get_stringtable_entries.html
rename to jni/libpcre/sources/doc/html/pcre_get_stringtable_entries.html
diff --git a/jni/libpcre/doc/html/pcre_get_substring.html b/jni/libpcre/sources/doc/html/pcre_get_substring.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_get_substring.html
rename to jni/libpcre/sources/doc/html/pcre_get_substring.html
diff --git a/jni/libpcre/doc/html/pcre_get_substring_list.html b/jni/libpcre/sources/doc/html/pcre_get_substring_list.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_get_substring_list.html
rename to jni/libpcre/sources/doc/html/pcre_get_substring_list.html
diff --git a/jni/libpcre/doc/html/pcre_info.html b/jni/libpcre/sources/doc/html/pcre_info.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_info.html
rename to jni/libpcre/sources/doc/html/pcre_info.html
diff --git a/jni/libpcre/doc/html/pcre_jit_stack_alloc.html b/jni/libpcre/sources/doc/html/pcre_jit_stack_alloc.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_jit_stack_alloc.html
rename to jni/libpcre/sources/doc/html/pcre_jit_stack_alloc.html
diff --git a/jni/libpcre/doc/html/pcre_jit_stack_free.html b/jni/libpcre/sources/doc/html/pcre_jit_stack_free.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_jit_stack_free.html
rename to jni/libpcre/sources/doc/html/pcre_jit_stack_free.html
diff --git a/jni/libpcre/doc/html/pcre_maketables.html b/jni/libpcre/sources/doc/html/pcre_maketables.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_maketables.html
rename to jni/libpcre/sources/doc/html/pcre_maketables.html
diff --git a/jni/libpcre/doc/html/pcre_refcount.html b/jni/libpcre/sources/doc/html/pcre_refcount.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_refcount.html
rename to jni/libpcre/sources/doc/html/pcre_refcount.html
diff --git a/jni/libpcre/doc/html/pcre_study.html b/jni/libpcre/sources/doc/html/pcre_study.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_study.html
rename to jni/libpcre/sources/doc/html/pcre_study.html
diff --git a/jni/libpcre/doc/html/pcre_version.html b/jni/libpcre/sources/doc/html/pcre_version.html
similarity index 100%
rename from jni/libpcre/doc/html/pcre_version.html
rename to jni/libpcre/sources/doc/html/pcre_version.html
diff --git a/jni/libpcre/doc/html/pcreapi.html b/jni/libpcre/sources/doc/html/pcreapi.html
similarity index 100%
rename from jni/libpcre/doc/html/pcreapi.html
rename to jni/libpcre/sources/doc/html/pcreapi.html
diff --git a/jni/libpcre/doc/html/pcrebuild.html b/jni/libpcre/sources/doc/html/pcrebuild.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrebuild.html
rename to jni/libpcre/sources/doc/html/pcrebuild.html
diff --git a/jni/libpcre/doc/html/pcrecallout.html b/jni/libpcre/sources/doc/html/pcrecallout.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrecallout.html
rename to jni/libpcre/sources/doc/html/pcrecallout.html
diff --git a/jni/libpcre/doc/html/pcrecompat.html b/jni/libpcre/sources/doc/html/pcrecompat.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrecompat.html
rename to jni/libpcre/sources/doc/html/pcrecompat.html
diff --git a/jni/libpcre/doc/html/pcrecpp.html b/jni/libpcre/sources/doc/html/pcrecpp.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrecpp.html
rename to jni/libpcre/sources/doc/html/pcrecpp.html
diff --git a/jni/libpcre/doc/html/pcredemo.html b/jni/libpcre/sources/doc/html/pcredemo.html
similarity index 100%
rename from jni/libpcre/doc/html/pcredemo.html
rename to jni/libpcre/sources/doc/html/pcredemo.html
diff --git a/jni/libpcre/doc/html/pcregrep.html b/jni/libpcre/sources/doc/html/pcregrep.html
similarity index 100%
rename from jni/libpcre/doc/html/pcregrep.html
rename to jni/libpcre/sources/doc/html/pcregrep.html
diff --git a/jni/libpcre/doc/html/pcrejit.html b/jni/libpcre/sources/doc/html/pcrejit.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrejit.html
rename to jni/libpcre/sources/doc/html/pcrejit.html
diff --git a/jni/libpcre/doc/html/pcrelimits.html b/jni/libpcre/sources/doc/html/pcrelimits.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrelimits.html
rename to jni/libpcre/sources/doc/html/pcrelimits.html
diff --git a/jni/libpcre/doc/html/pcrematching.html b/jni/libpcre/sources/doc/html/pcrematching.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrematching.html
rename to jni/libpcre/sources/doc/html/pcrematching.html
diff --git a/jni/libpcre/doc/html/pcrepartial.html b/jni/libpcre/sources/doc/html/pcrepartial.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrepartial.html
rename to jni/libpcre/sources/doc/html/pcrepartial.html
diff --git a/jni/libpcre/doc/html/pcrepattern.html b/jni/libpcre/sources/doc/html/pcrepattern.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrepattern.html
rename to jni/libpcre/sources/doc/html/pcrepattern.html
diff --git a/jni/libpcre/doc/html/pcreperform.html b/jni/libpcre/sources/doc/html/pcreperform.html
similarity index 100%
rename from jni/libpcre/doc/html/pcreperform.html
rename to jni/libpcre/sources/doc/html/pcreperform.html
diff --git a/jni/libpcre/doc/html/pcreposix.html b/jni/libpcre/sources/doc/html/pcreposix.html
similarity index 100%
rename from jni/libpcre/doc/html/pcreposix.html
rename to jni/libpcre/sources/doc/html/pcreposix.html
diff --git a/jni/libpcre/doc/html/pcreprecompile.html b/jni/libpcre/sources/doc/html/pcreprecompile.html
similarity index 100%
rename from jni/libpcre/doc/html/pcreprecompile.html
rename to jni/libpcre/sources/doc/html/pcreprecompile.html
diff --git a/jni/libpcre/doc/html/pcresample.html b/jni/libpcre/sources/doc/html/pcresample.html
similarity index 100%
rename from jni/libpcre/doc/html/pcresample.html
rename to jni/libpcre/sources/doc/html/pcresample.html
diff --git a/jni/libpcre/doc/html/pcrestack.html b/jni/libpcre/sources/doc/html/pcrestack.html
similarity index 100%
rename from jni/libpcre/doc/html/pcrestack.html
rename to jni/libpcre/sources/doc/html/pcrestack.html
diff --git a/jni/libpcre/doc/html/pcresyntax.html b/jni/libpcre/sources/doc/html/pcresyntax.html
similarity index 100%
rename from jni/libpcre/doc/html/pcresyntax.html
rename to jni/libpcre/sources/doc/html/pcresyntax.html
diff --git a/jni/libpcre/doc/html/pcretest.html b/jni/libpcre/sources/doc/html/pcretest.html
similarity index 100%
rename from jni/libpcre/doc/html/pcretest.html
rename to jni/libpcre/sources/doc/html/pcretest.html
diff --git a/jni/libpcre/doc/html/pcreunicode.html b/jni/libpcre/sources/doc/html/pcreunicode.html
similarity index 100%
rename from jni/libpcre/doc/html/pcreunicode.html
rename to jni/libpcre/sources/doc/html/pcreunicode.html
diff --git a/jni/libpcre/doc/index.html.src b/jni/libpcre/sources/doc/index.html.src
similarity index 100%
rename from jni/libpcre/doc/index.html.src
rename to jni/libpcre/sources/doc/index.html.src
diff --git a/jni/libpcre/doc/pcre-config.1 b/jni/libpcre/sources/doc/pcre-config.1
similarity index 100%
rename from jni/libpcre/doc/pcre-config.1
rename to jni/libpcre/sources/doc/pcre-config.1
diff --git a/jni/libpcre/doc/pcre-config.txt b/jni/libpcre/sources/doc/pcre-config.txt
similarity index 100%
rename from jni/libpcre/doc/pcre-config.txt
rename to jni/libpcre/sources/doc/pcre-config.txt
diff --git a/jni/libpcre/doc/pcre.3 b/jni/libpcre/sources/doc/pcre.3
similarity index 100%
rename from jni/libpcre/doc/pcre.3
rename to jni/libpcre/sources/doc/pcre.3
diff --git a/jni/libpcre/doc/pcre.txt b/jni/libpcre/sources/doc/pcre.txt
similarity index 100%
rename from jni/libpcre/doc/pcre.txt
rename to jni/libpcre/sources/doc/pcre.txt
diff --git a/jni/libpcre/doc/pcre_assign_jit_stack.3 b/jni/libpcre/sources/doc/pcre_assign_jit_stack.3
similarity index 100%
rename from jni/libpcre/doc/pcre_assign_jit_stack.3
rename to jni/libpcre/sources/doc/pcre_assign_jit_stack.3
diff --git a/jni/libpcre/doc/pcre_compile.3 b/jni/libpcre/sources/doc/pcre_compile.3
similarity index 100%
rename from jni/libpcre/doc/pcre_compile.3
rename to jni/libpcre/sources/doc/pcre_compile.3
diff --git a/jni/libpcre/doc/pcre_compile2.3 b/jni/libpcre/sources/doc/pcre_compile2.3
similarity index 100%
rename from jni/libpcre/doc/pcre_compile2.3
rename to jni/libpcre/sources/doc/pcre_compile2.3
diff --git a/jni/libpcre/doc/pcre_config.3 b/jni/libpcre/sources/doc/pcre_config.3
similarity index 100%
rename from jni/libpcre/doc/pcre_config.3
rename to jni/libpcre/sources/doc/pcre_config.3
diff --git a/jni/libpcre/doc/pcre_copy_named_substring.3 b/jni/libpcre/sources/doc/pcre_copy_named_substring.3
similarity index 100%
rename from jni/libpcre/doc/pcre_copy_named_substring.3
rename to jni/libpcre/sources/doc/pcre_copy_named_substring.3
diff --git a/jni/libpcre/doc/pcre_copy_substring.3 b/jni/libpcre/sources/doc/pcre_copy_substring.3
similarity index 100%
rename from jni/libpcre/doc/pcre_copy_substring.3
rename to jni/libpcre/sources/doc/pcre_copy_substring.3
diff --git a/jni/libpcre/doc/pcre_dfa_exec.3 b/jni/libpcre/sources/doc/pcre_dfa_exec.3
similarity index 100%
rename from jni/libpcre/doc/pcre_dfa_exec.3
rename to jni/libpcre/sources/doc/pcre_dfa_exec.3
diff --git a/jni/libpcre/doc/pcre_exec.3 b/jni/libpcre/sources/doc/pcre_exec.3
similarity index 100%
rename from jni/libpcre/doc/pcre_exec.3
rename to jni/libpcre/sources/doc/pcre_exec.3
diff --git a/jni/libpcre/doc/pcre_free_study.3 b/jni/libpcre/sources/doc/pcre_free_study.3
similarity index 100%
rename from jni/libpcre/doc/pcre_free_study.3
rename to jni/libpcre/sources/doc/pcre_free_study.3
diff --git a/jni/libpcre/doc/pcre_free_substring.3 b/jni/libpcre/sources/doc/pcre_free_substring.3
similarity index 100%
rename from jni/libpcre/doc/pcre_free_substring.3
rename to jni/libpcre/sources/doc/pcre_free_substring.3
diff --git a/jni/libpcre/doc/pcre_free_substring_list.3 b/jni/libpcre/sources/doc/pcre_free_substring_list.3
similarity index 100%
rename from jni/libpcre/doc/pcre_free_substring_list.3
rename to jni/libpcre/sources/doc/pcre_free_substring_list.3
diff --git a/jni/libpcre/doc/pcre_fullinfo.3 b/jni/libpcre/sources/doc/pcre_fullinfo.3
similarity index 100%
rename from jni/libpcre/doc/pcre_fullinfo.3
rename to jni/libpcre/sources/doc/pcre_fullinfo.3
diff --git a/jni/libpcre/doc/pcre_get_named_substring.3 b/jni/libpcre/sources/doc/pcre_get_named_substring.3
similarity index 100%
rename from jni/libpcre/doc/pcre_get_named_substring.3
rename to jni/libpcre/sources/doc/pcre_get_named_substring.3
diff --git a/jni/libpcre/doc/pcre_get_stringnumber.3 b/jni/libpcre/sources/doc/pcre_get_stringnumber.3
similarity index 100%
rename from jni/libpcre/doc/pcre_get_stringnumber.3
rename to jni/libpcre/sources/doc/pcre_get_stringnumber.3
diff --git a/jni/libpcre/doc/pcre_get_stringtable_entries.3 b/jni/libpcre/sources/doc/pcre_get_stringtable_entries.3
similarity index 100%
rename from jni/libpcre/doc/pcre_get_stringtable_entries.3
rename to jni/libpcre/sources/doc/pcre_get_stringtable_entries.3
diff --git a/jni/libpcre/doc/pcre_get_substring.3 b/jni/libpcre/sources/doc/pcre_get_substring.3
similarity index 100%
rename from jni/libpcre/doc/pcre_get_substring.3
rename to jni/libpcre/sources/doc/pcre_get_substring.3
diff --git a/jni/libpcre/doc/pcre_get_substring_list.3 b/jni/libpcre/sources/doc/pcre_get_substring_list.3
similarity index 100%
rename from jni/libpcre/doc/pcre_get_substring_list.3
rename to jni/libpcre/sources/doc/pcre_get_substring_list.3
diff --git a/jni/libpcre/doc/pcre_info.3 b/jni/libpcre/sources/doc/pcre_info.3
similarity index 100%
rename from jni/libpcre/doc/pcre_info.3
rename to jni/libpcre/sources/doc/pcre_info.3
diff --git a/jni/libpcre/doc/pcre_jit_stack_alloc.3 b/jni/libpcre/sources/doc/pcre_jit_stack_alloc.3
similarity index 100%
rename from jni/libpcre/doc/pcre_jit_stack_alloc.3
rename to jni/libpcre/sources/doc/pcre_jit_stack_alloc.3
diff --git a/jni/libpcre/doc/pcre_jit_stack_free.3 b/jni/libpcre/sources/doc/pcre_jit_stack_free.3
similarity index 100%
rename from jni/libpcre/doc/pcre_jit_stack_free.3
rename to jni/libpcre/sources/doc/pcre_jit_stack_free.3
diff --git a/jni/libpcre/doc/pcre_maketables.3 b/jni/libpcre/sources/doc/pcre_maketables.3
similarity index 100%
rename from jni/libpcre/doc/pcre_maketables.3
rename to jni/libpcre/sources/doc/pcre_maketables.3
diff --git a/jni/libpcre/doc/pcre_refcount.3 b/jni/libpcre/sources/doc/pcre_refcount.3
similarity index 100%
rename from jni/libpcre/doc/pcre_refcount.3
rename to jni/libpcre/sources/doc/pcre_refcount.3
diff --git a/jni/libpcre/doc/pcre_study.3 b/jni/libpcre/sources/doc/pcre_study.3
similarity index 100%
rename from jni/libpcre/doc/pcre_study.3
rename to jni/libpcre/sources/doc/pcre_study.3
diff --git a/jni/libpcre/doc/pcre_version.3 b/jni/libpcre/sources/doc/pcre_version.3
similarity index 100%
rename from jni/libpcre/doc/pcre_version.3
rename to jni/libpcre/sources/doc/pcre_version.3
diff --git a/jni/libpcre/doc/pcreapi.3 b/jni/libpcre/sources/doc/pcreapi.3
similarity index 100%
rename from jni/libpcre/doc/pcreapi.3
rename to jni/libpcre/sources/doc/pcreapi.3
diff --git a/jni/libpcre/doc/pcrebuild.3 b/jni/libpcre/sources/doc/pcrebuild.3
similarity index 100%
rename from jni/libpcre/doc/pcrebuild.3
rename to jni/libpcre/sources/doc/pcrebuild.3
diff --git a/jni/libpcre/doc/pcrecallout.3 b/jni/libpcre/sources/doc/pcrecallout.3
similarity index 100%
rename from jni/libpcre/doc/pcrecallout.3
rename to jni/libpcre/sources/doc/pcrecallout.3
diff --git a/jni/libpcre/doc/pcrecompat.3 b/jni/libpcre/sources/doc/pcrecompat.3
similarity index 100%
rename from jni/libpcre/doc/pcrecompat.3
rename to jni/libpcre/sources/doc/pcrecompat.3
diff --git a/jni/libpcre/doc/pcrecpp.3 b/jni/libpcre/sources/doc/pcrecpp.3
similarity index 100%
rename from jni/libpcre/doc/pcrecpp.3
rename to jni/libpcre/sources/doc/pcrecpp.3
diff --git a/jni/libpcre/doc/pcregrep.1 b/jni/libpcre/sources/doc/pcregrep.1
similarity index 100%
rename from jni/libpcre/doc/pcregrep.1
rename to jni/libpcre/sources/doc/pcregrep.1
diff --git a/jni/libpcre/doc/pcregrep.txt b/jni/libpcre/sources/doc/pcregrep.txt
similarity index 100%
rename from jni/libpcre/doc/pcregrep.txt
rename to jni/libpcre/sources/doc/pcregrep.txt
diff --git a/jni/libpcre/doc/pcrejit.3 b/jni/libpcre/sources/doc/pcrejit.3
similarity index 100%
rename from jni/libpcre/doc/pcrejit.3
rename to jni/libpcre/sources/doc/pcrejit.3
diff --git a/jni/libpcre/doc/pcrelimits.3 b/jni/libpcre/sources/doc/pcrelimits.3
similarity index 100%
rename from jni/libpcre/doc/pcrelimits.3
rename to jni/libpcre/sources/doc/pcrelimits.3
diff --git a/jni/libpcre/doc/pcrematching.3 b/jni/libpcre/sources/doc/pcrematching.3
similarity index 100%
rename from jni/libpcre/doc/pcrematching.3
rename to jni/libpcre/sources/doc/pcrematching.3
diff --git a/jni/libpcre/doc/pcrepartial.3 b/jni/libpcre/sources/doc/pcrepartial.3
similarity index 100%
rename from jni/libpcre/doc/pcrepartial.3
rename to jni/libpcre/sources/doc/pcrepartial.3
diff --git a/jni/libpcre/doc/pcrepattern.3 b/jni/libpcre/sources/doc/pcrepattern.3
similarity index 100%
rename from jni/libpcre/doc/pcrepattern.3
rename to jni/libpcre/sources/doc/pcrepattern.3
diff --git a/jni/libpcre/doc/pcreperform.3 b/jni/libpcre/sources/doc/pcreperform.3
similarity index 100%
rename from jni/libpcre/doc/pcreperform.3
rename to jni/libpcre/sources/doc/pcreperform.3
diff --git a/jni/libpcre/doc/pcreposix.3 b/jni/libpcre/sources/doc/pcreposix.3
similarity index 100%
rename from jni/libpcre/doc/pcreposix.3
rename to jni/libpcre/sources/doc/pcreposix.3
diff --git a/jni/libpcre/doc/pcreprecompile.3 b/jni/libpcre/sources/doc/pcreprecompile.3
similarity index 100%
rename from jni/libpcre/doc/pcreprecompile.3
rename to jni/libpcre/sources/doc/pcreprecompile.3
diff --git a/jni/libpcre/doc/pcresample.3 b/jni/libpcre/sources/doc/pcresample.3
similarity index 100%
rename from jni/libpcre/doc/pcresample.3
rename to jni/libpcre/sources/doc/pcresample.3
diff --git a/jni/libpcre/doc/pcrestack.3 b/jni/libpcre/sources/doc/pcrestack.3
similarity index 100%
rename from jni/libpcre/doc/pcrestack.3
rename to jni/libpcre/sources/doc/pcrestack.3
diff --git a/jni/libpcre/doc/pcresyntax.3 b/jni/libpcre/sources/doc/pcresyntax.3
similarity index 100%
rename from jni/libpcre/doc/pcresyntax.3
rename to jni/libpcre/sources/doc/pcresyntax.3
diff --git a/jni/libpcre/doc/pcretest.1 b/jni/libpcre/sources/doc/pcretest.1
similarity index 100%
rename from jni/libpcre/doc/pcretest.1
rename to jni/libpcre/sources/doc/pcretest.1
diff --git a/jni/libpcre/doc/pcretest.txt b/jni/libpcre/sources/doc/pcretest.txt
similarity index 100%
rename from jni/libpcre/doc/pcretest.txt
rename to jni/libpcre/sources/doc/pcretest.txt
diff --git a/jni/libpcre/doc/pcreunicode.3 b/jni/libpcre/sources/doc/pcreunicode.3
similarity index 100%
rename from jni/libpcre/doc/pcreunicode.3
rename to jni/libpcre/sources/doc/pcreunicode.3
diff --git a/jni/libpcre/doc/perltest.txt b/jni/libpcre/sources/doc/perltest.txt
similarity index 100%
rename from jni/libpcre/doc/perltest.txt
rename to jni/libpcre/sources/doc/perltest.txt
diff --git a/jni/libpcre/install-sh b/jni/libpcre/sources/install-sh
similarity index 100%
rename from jni/libpcre/install-sh
rename to jni/libpcre/sources/install-sh
diff --git a/jni/libpcre/libpcre.pc b/jni/libpcre/sources/libpcre.pc
similarity index 100%
rename from jni/libpcre/libpcre.pc
rename to jni/libpcre/sources/libpcre.pc
diff --git a/jni/libpcre/libpcre.pc.in b/jni/libpcre/sources/libpcre.pc.in
similarity index 100%
rename from jni/libpcre/libpcre.pc.in
rename to jni/libpcre/sources/libpcre.pc.in
diff --git a/jni/libpcre/libpcrecpp.pc b/jni/libpcre/sources/libpcrecpp.pc
similarity index 100%
rename from jni/libpcre/libpcrecpp.pc
rename to jni/libpcre/sources/libpcrecpp.pc
diff --git a/jni/libpcre/libpcrecpp.pc.in b/jni/libpcre/sources/libpcrecpp.pc.in
similarity index 100%
rename from jni/libpcre/libpcrecpp.pc.in
rename to jni/libpcre/sources/libpcrecpp.pc.in
diff --git a/jni/libpcre/libpcreposix.pc b/jni/libpcre/sources/libpcreposix.pc
similarity index 100%
rename from jni/libpcre/libpcreposix.pc
rename to jni/libpcre/sources/libpcreposix.pc
diff --git a/jni/libpcre/libpcreposix.pc.in b/jni/libpcre/sources/libpcreposix.pc.in
similarity index 100%
rename from jni/libpcre/libpcreposix.pc.in
rename to jni/libpcre/sources/libpcreposix.pc.in
diff --git a/jni/libpcre/libtool b/jni/libpcre/sources/libtool
similarity index 100%
rename from jni/libpcre/libtool
rename to jni/libpcre/sources/libtool
diff --git a/jni/libpcre/ltmain.sh b/jni/libpcre/sources/ltmain.sh
similarity index 100%
rename from jni/libpcre/ltmain.sh
rename to jni/libpcre/sources/ltmain.sh
diff --git a/jni/libpcre/makevp.bat b/jni/libpcre/sources/makevp.bat
similarity index 100%
rename from jni/libpcre/makevp.bat
rename to jni/libpcre/sources/makevp.bat
diff --git a/jni/libpcre/makevp_c.txt b/jni/libpcre/sources/makevp_c.txt
similarity index 100%
rename from jni/libpcre/makevp_c.txt
rename to jni/libpcre/sources/makevp_c.txt
diff --git a/jni/libpcre/makevp_l.txt b/jni/libpcre/sources/makevp_l.txt
similarity index 100%
rename from jni/libpcre/makevp_l.txt
rename to jni/libpcre/sources/makevp_l.txt
diff --git a/jni/libpcre/missing b/jni/libpcre/sources/missing
similarity index 100%
rename from jni/libpcre/missing
rename to jni/libpcre/sources/missing
diff --git a/jni/libpcre/pcre-config b/jni/libpcre/sources/pcre-config
similarity index 100%
rename from jni/libpcre/pcre-config
rename to jni/libpcre/sources/pcre-config
diff --git a/jni/libpcre/pcre-config.in b/jni/libpcre/sources/pcre-config.in
similarity index 100%
rename from jni/libpcre/pcre-config.in
rename to jni/libpcre/sources/pcre-config.in
diff --git a/jni/libpcre/pcre.h b/jni/libpcre/sources/pcre.h
similarity index 100%
rename from jni/libpcre/pcre.h
rename to jni/libpcre/sources/pcre.h
diff --git a/jni/libpcre/pcre.h.generic b/jni/libpcre/sources/pcre.h.generic
similarity index 100%
rename from jni/libpcre/pcre.h.generic
rename to jni/libpcre/sources/pcre.h.generic
diff --git a/jni/libpcre/pcre.h.in b/jni/libpcre/sources/pcre.h.in
similarity index 100%
rename from jni/libpcre/pcre.h.in
rename to jni/libpcre/sources/pcre.h.in
diff --git a/jni/libpcre/pcre_chartables.c b/jni/libpcre/sources/pcre_chartables.c
similarity index 100%
rename from jni/libpcre/pcre_chartables.c
rename to jni/libpcre/sources/pcre_chartables.c
diff --git a/jni/libpcre/pcre_chartables.c.dist b/jni/libpcre/sources/pcre_chartables.c.dist
similarity index 100%
rename from jni/libpcre/pcre_chartables.c.dist
rename to jni/libpcre/sources/pcre_chartables.c.dist
diff --git a/jni/libpcre/pcre_compile.c b/jni/libpcre/sources/pcre_compile.c
similarity index 100%
rename from jni/libpcre/pcre_compile.c
rename to jni/libpcre/sources/pcre_compile.c
diff --git a/jni/libpcre/pcre_config.c b/jni/libpcre/sources/pcre_config.c
similarity index 100%
rename from jni/libpcre/pcre_config.c
rename to jni/libpcre/sources/pcre_config.c
diff --git a/jni/libpcre/pcre_dfa_exec.c b/jni/libpcre/sources/pcre_dfa_exec.c
similarity index 100%
rename from jni/libpcre/pcre_dfa_exec.c
rename to jni/libpcre/sources/pcre_dfa_exec.c
diff --git a/jni/libpcre/pcre_exec.c b/jni/libpcre/sources/pcre_exec.c
similarity index 100%
rename from jni/libpcre/pcre_exec.c
rename to jni/libpcre/sources/pcre_exec.c
diff --git a/jni/libpcre/pcre_fullinfo.c b/jni/libpcre/sources/pcre_fullinfo.c
similarity index 100%
rename from jni/libpcre/pcre_fullinfo.c
rename to jni/libpcre/sources/pcre_fullinfo.c
diff --git a/jni/libpcre/pcre_get.c b/jni/libpcre/sources/pcre_get.c
similarity index 100%
rename from jni/libpcre/pcre_get.c
rename to jni/libpcre/sources/pcre_get.c
diff --git a/jni/libpcre/pcre_globals.c b/jni/libpcre/sources/pcre_globals.c
similarity index 100%
rename from jni/libpcre/pcre_globals.c
rename to jni/libpcre/sources/pcre_globals.c
diff --git a/jni/libpcre/pcre_info.c b/jni/libpcre/sources/pcre_info.c
similarity index 100%
rename from jni/libpcre/pcre_info.c
rename to jni/libpcre/sources/pcre_info.c
diff --git a/jni/libpcre/pcre_internal.h b/jni/libpcre/sources/pcre_internal.h
similarity index 100%
rename from jni/libpcre/pcre_internal.h
rename to jni/libpcre/sources/pcre_internal.h
diff --git a/jni/libpcre/pcre_jit_compile.c b/jni/libpcre/sources/pcre_jit_compile.c
similarity index 100%
rename from jni/libpcre/pcre_jit_compile.c
rename to jni/libpcre/sources/pcre_jit_compile.c
diff --git a/jni/libpcre/pcre_jit_test.c b/jni/libpcre/sources/pcre_jit_test.c
similarity index 100%
rename from jni/libpcre/pcre_jit_test.c
rename to jni/libpcre/sources/pcre_jit_test.c
diff --git a/jni/libpcre/pcre_maketables.c b/jni/libpcre/sources/pcre_maketables.c
similarity index 100%
rename from jni/libpcre/pcre_maketables.c
rename to jni/libpcre/sources/pcre_maketables.c
diff --git a/jni/libpcre/pcre_newline.c b/jni/libpcre/sources/pcre_newline.c
similarity index 100%
rename from jni/libpcre/pcre_newline.c
rename to jni/libpcre/sources/pcre_newline.c
diff --git a/jni/libpcre/pcre_ord2utf8.c b/jni/libpcre/sources/pcre_ord2utf8.c
similarity index 100%
rename from jni/libpcre/pcre_ord2utf8.c
rename to jni/libpcre/sources/pcre_ord2utf8.c
diff --git a/jni/libpcre/pcre_printint.src b/jni/libpcre/sources/pcre_printint.src
similarity index 100%
rename from jni/libpcre/pcre_printint.src
rename to jni/libpcre/sources/pcre_printint.src
diff --git a/jni/libpcre/pcre_refcount.c b/jni/libpcre/sources/pcre_refcount.c
similarity index 100%
rename from jni/libpcre/pcre_refcount.c
rename to jni/libpcre/sources/pcre_refcount.c
diff --git a/jni/libpcre/pcre_scanner.cc b/jni/libpcre/sources/pcre_scanner.cc
similarity index 100%
rename from jni/libpcre/pcre_scanner.cc
rename to jni/libpcre/sources/pcre_scanner.cc
diff --git a/jni/libpcre/pcre_scanner.h b/jni/libpcre/sources/pcre_scanner.h
similarity index 100%
rename from jni/libpcre/pcre_scanner.h
rename to jni/libpcre/sources/pcre_scanner.h
diff --git a/jni/libpcre/pcre_scanner_unittest.cc b/jni/libpcre/sources/pcre_scanner_unittest.cc
similarity index 100%
rename from jni/libpcre/pcre_scanner_unittest.cc
rename to jni/libpcre/sources/pcre_scanner_unittest.cc
diff --git a/jni/libpcre/pcre_stringpiece.cc b/jni/libpcre/sources/pcre_stringpiece.cc
similarity index 100%
rename from jni/libpcre/pcre_stringpiece.cc
rename to jni/libpcre/sources/pcre_stringpiece.cc
diff --git a/jni/libpcre/pcre_stringpiece.h b/jni/libpcre/sources/pcre_stringpiece.h
similarity index 100%
rename from jni/libpcre/pcre_stringpiece.h
rename to jni/libpcre/sources/pcre_stringpiece.h
diff --git a/jni/libpcre/pcre_stringpiece.h.in b/jni/libpcre/sources/pcre_stringpiece.h.in
similarity index 100%
rename from jni/libpcre/pcre_stringpiece.h.in
rename to jni/libpcre/sources/pcre_stringpiece.h.in
diff --git a/jni/libpcre/pcre_stringpiece_unittest.cc b/jni/libpcre/sources/pcre_stringpiece_unittest.cc
similarity index 100%
rename from jni/libpcre/pcre_stringpiece_unittest.cc
rename to jni/libpcre/sources/pcre_stringpiece_unittest.cc
diff --git a/jni/libpcre/pcre_study.c b/jni/libpcre/sources/pcre_study.c
similarity index 100%
rename from jni/libpcre/pcre_study.c
rename to jni/libpcre/sources/pcre_study.c
diff --git a/jni/libpcre/pcre_tables.c b/jni/libpcre/sources/pcre_tables.c
similarity index 100%
rename from jni/libpcre/pcre_tables.c
rename to jni/libpcre/sources/pcre_tables.c
diff --git a/jni/libpcre/pcre_try_flipped.c b/jni/libpcre/sources/pcre_try_flipped.c
similarity index 100%
rename from jni/libpcre/pcre_try_flipped.c
rename to jni/libpcre/sources/pcre_try_flipped.c
diff --git a/jni/libpcre/pcre_ucd.c b/jni/libpcre/sources/pcre_ucd.c
similarity index 100%
rename from jni/libpcre/pcre_ucd.c
rename to jni/libpcre/sources/pcre_ucd.c
diff --git a/jni/libpcre/pcre_valid_utf8.c b/jni/libpcre/sources/pcre_valid_utf8.c
similarity index 100%
rename from jni/libpcre/pcre_valid_utf8.c
rename to jni/libpcre/sources/pcre_valid_utf8.c
diff --git a/jni/libpcre/pcre_version.c b/jni/libpcre/sources/pcre_version.c
similarity index 100%
rename from jni/libpcre/pcre_version.c
rename to jni/libpcre/sources/pcre_version.c
diff --git a/jni/libpcre/pcre_xclass.c b/jni/libpcre/sources/pcre_xclass.c
similarity index 100%
rename from jni/libpcre/pcre_xclass.c
rename to jni/libpcre/sources/pcre_xclass.c
diff --git a/jni/libpcre/pcrecpp.cc b/jni/libpcre/sources/pcrecpp.cc
similarity index 100%
rename from jni/libpcre/pcrecpp.cc
rename to jni/libpcre/sources/pcrecpp.cc
diff --git a/jni/libpcre/pcrecpp.h b/jni/libpcre/sources/pcrecpp.h
similarity index 100%
rename from jni/libpcre/pcrecpp.h
rename to jni/libpcre/sources/pcrecpp.h
diff --git a/jni/libpcre/pcrecpp_internal.h b/jni/libpcre/sources/pcrecpp_internal.h
similarity index 100%
rename from jni/libpcre/pcrecpp_internal.h
rename to jni/libpcre/sources/pcrecpp_internal.h
diff --git a/jni/libpcre/pcrecpp_unittest.cc b/jni/libpcre/sources/pcrecpp_unittest.cc
similarity index 100%
rename from jni/libpcre/pcrecpp_unittest.cc
rename to jni/libpcre/sources/pcrecpp_unittest.cc
diff --git a/jni/libpcre/pcrecpparg.h b/jni/libpcre/sources/pcrecpparg.h
similarity index 100%
rename from jni/libpcre/pcrecpparg.h
rename to jni/libpcre/sources/pcrecpparg.h
diff --git a/jni/libpcre/pcrecpparg.h.in b/jni/libpcre/sources/pcrecpparg.h.in
similarity index 100%
rename from jni/libpcre/pcrecpparg.h.in
rename to jni/libpcre/sources/pcrecpparg.h.in
diff --git a/jni/libpcre/pcredemo.c b/jni/libpcre/sources/pcredemo.c
similarity index 100%
rename from jni/libpcre/pcredemo.c
rename to jni/libpcre/sources/pcredemo.c
diff --git a/jni/libpcre/pcregexp.pas b/jni/libpcre/sources/pcregexp.pas
similarity index 100%
rename from jni/libpcre/pcregexp.pas
rename to jni/libpcre/sources/pcregexp.pas
diff --git a/jni/libpcre/pcregrep.c b/jni/libpcre/sources/pcregrep.c
similarity index 100%
rename from jni/libpcre/pcregrep.c
rename to jni/libpcre/sources/pcregrep.c
diff --git a/jni/libpcre/pcreposix.c b/jni/libpcre/sources/pcreposix.c
similarity index 100%
rename from jni/libpcre/pcreposix.c
rename to jni/libpcre/sources/pcreposix.c
diff --git a/jni/libpcre/pcreposix.h b/jni/libpcre/sources/pcreposix.h
similarity index 100%
rename from jni/libpcre/pcreposix.h
rename to jni/libpcre/sources/pcreposix.h
diff --git a/jni/libpcre/pcretest.c b/jni/libpcre/sources/pcretest.c
similarity index 100%
rename from jni/libpcre/pcretest.c
rename to jni/libpcre/sources/pcretest.c
diff --git a/jni/libpcre/perltest.pl b/jni/libpcre/sources/perltest.pl
similarity index 100%
rename from jni/libpcre/perltest.pl
rename to jni/libpcre/sources/perltest.pl
diff --git a/jni/libpcre/sljit/sljitConfig.h b/jni/libpcre/sources/sljit/sljitConfig.h
similarity index 100%
rename from jni/libpcre/sljit/sljitConfig.h
rename to jni/libpcre/sources/sljit/sljitConfig.h
diff --git a/jni/libpcre/sljit/sljitConfigInternal.h b/jni/libpcre/sources/sljit/sljitConfigInternal.h
similarity index 100%
rename from jni/libpcre/sljit/sljitConfigInternal.h
rename to jni/libpcre/sources/sljit/sljitConfigInternal.h
diff --git a/jni/libpcre/sljit/sljitExecAllocator.c b/jni/libpcre/sources/sljit/sljitExecAllocator.c
similarity index 100%
rename from jni/libpcre/sljit/sljitExecAllocator.c
rename to jni/libpcre/sources/sljit/sljitExecAllocator.c
diff --git a/jni/libpcre/sljit/sljitLir.c b/jni/libpcre/sources/sljit/sljitLir.c
similarity index 100%
rename from jni/libpcre/sljit/sljitLir.c
rename to jni/libpcre/sources/sljit/sljitLir.c
diff --git a/jni/libpcre/sljit/sljitLir.h b/jni/libpcre/sources/sljit/sljitLir.h
similarity index 100%
rename from jni/libpcre/sljit/sljitLir.h
rename to jni/libpcre/sources/sljit/sljitLir.h
diff --git a/jni/libpcre/sljit/sljitNativeARM_Thumb2.c b/jni/libpcre/sources/sljit/sljitNativeARM_Thumb2.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativeARM_Thumb2.c
rename to jni/libpcre/sources/sljit/sljitNativeARM_Thumb2.c
diff --git a/jni/libpcre/sljit/sljitNativeARM_v5.c b/jni/libpcre/sources/sljit/sljitNativeARM_v5.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativeARM_v5.c
rename to jni/libpcre/sources/sljit/sljitNativeARM_v5.c
diff --git a/jni/libpcre/sljit/sljitNativeMIPS_32.c b/jni/libpcre/sources/sljit/sljitNativeMIPS_32.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativeMIPS_32.c
rename to jni/libpcre/sources/sljit/sljitNativeMIPS_32.c
diff --git a/jni/libpcre/sljit/sljitNativeMIPS_common.c b/jni/libpcre/sources/sljit/sljitNativeMIPS_common.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativeMIPS_common.c
rename to jni/libpcre/sources/sljit/sljitNativeMIPS_common.c
diff --git a/jni/libpcre/sljit/sljitNativePPC_32.c b/jni/libpcre/sources/sljit/sljitNativePPC_32.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativePPC_32.c
rename to jni/libpcre/sources/sljit/sljitNativePPC_32.c
diff --git a/jni/libpcre/sljit/sljitNativePPC_64.c b/jni/libpcre/sources/sljit/sljitNativePPC_64.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativePPC_64.c
rename to jni/libpcre/sources/sljit/sljitNativePPC_64.c
diff --git a/jni/libpcre/sljit/sljitNativePPC_common.c b/jni/libpcre/sources/sljit/sljitNativePPC_common.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativePPC_common.c
rename to jni/libpcre/sources/sljit/sljitNativePPC_common.c
diff --git a/jni/libpcre/sljit/sljitNativeX86_32.c b/jni/libpcre/sources/sljit/sljitNativeX86_32.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativeX86_32.c
rename to jni/libpcre/sources/sljit/sljitNativeX86_32.c
diff --git a/jni/libpcre/sljit/sljitNativeX86_64.c b/jni/libpcre/sources/sljit/sljitNativeX86_64.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativeX86_64.c
rename to jni/libpcre/sources/sljit/sljitNativeX86_64.c
diff --git a/jni/libpcre/sljit/sljitNativeX86_common.c b/jni/libpcre/sources/sljit/sljitNativeX86_common.c
similarity index 100%
rename from jni/libpcre/sljit/sljitNativeX86_common.c
rename to jni/libpcre/sources/sljit/sljitNativeX86_common.c
diff --git a/jni/libpcre/sljit/sljitUtils.c b/jni/libpcre/sources/sljit/sljitUtils.c
similarity index 100%
rename from jni/libpcre/sljit/sljitUtils.c
rename to jni/libpcre/sources/sljit/sljitUtils.c
diff --git a/jni/libpcre/stamp-h1 b/jni/libpcre/sources/stamp-h1
similarity index 100%
rename from jni/libpcre/stamp-h1
rename to jni/libpcre/sources/stamp-h1
diff --git a/jni/libpcre/testdata/grepinput b/jni/libpcre/sources/testdata/grepinput
similarity index 100%
rename from jni/libpcre/testdata/grepinput
rename to jni/libpcre/sources/testdata/grepinput
Binary files differ
diff --git a/jni/libpcre/testdata/grepinput3 b/jni/libpcre/sources/testdata/grepinput3
similarity index 100%
rename from jni/libpcre/testdata/grepinput3
rename to jni/libpcre/sources/testdata/grepinput3
diff --git a/jni/libpcre/testdata/grepinput8 b/jni/libpcre/sources/testdata/grepinput8
similarity index 100%
rename from jni/libpcre/testdata/grepinput8
rename to jni/libpcre/sources/testdata/grepinput8
Binary files differ
diff --git a/jni/libpcre/testdata/grepinputv b/jni/libpcre/sources/testdata/grepinputv
similarity index 100%
rename from jni/libpcre/testdata/grepinputv
rename to jni/libpcre/sources/testdata/grepinputv
diff --git a/jni/libpcre/testdata/grepinputx b/jni/libpcre/sources/testdata/grepinputx
similarity index 100%
rename from jni/libpcre/testdata/grepinputx
rename to jni/libpcre/sources/testdata/grepinputx
diff --git a/jni/libpcre/testdata/greplist b/jni/libpcre/sources/testdata/greplist
similarity index 100%
rename from jni/libpcre/testdata/greplist
rename to jni/libpcre/sources/testdata/greplist
diff --git a/jni/libpcre/testdata/grepoutput b/jni/libpcre/sources/testdata/grepoutput
similarity index 100%
rename from jni/libpcre/testdata/grepoutput
rename to jni/libpcre/sources/testdata/grepoutput
Binary files differ
diff --git a/jni/libpcre/testdata/grepoutput8 b/jni/libpcre/sources/testdata/grepoutput8
similarity index 100%
rename from jni/libpcre/testdata/grepoutput8
rename to jni/libpcre/sources/testdata/grepoutput8
Binary files differ
diff --git a/jni/libpcre/testdata/grepoutputN b/jni/libpcre/sources/testdata/grepoutputN
similarity index 100%
rename from jni/libpcre/testdata/grepoutputN
rename to jni/libpcre/sources/testdata/grepoutputN
Binary files differ
diff --git a/jni/libpcre/testdata/testinput1 b/jni/libpcre/sources/testdata/testinput1
similarity index 100%
rename from jni/libpcre/testdata/testinput1
rename to jni/libpcre/sources/testdata/testinput1
diff --git a/jni/libpcre/testdata/testinput10 b/jni/libpcre/sources/testdata/testinput10
similarity index 100%
rename from jni/libpcre/testdata/testinput10
rename to jni/libpcre/sources/testdata/testinput10
diff --git a/jni/libpcre/testdata/testinput11 b/jni/libpcre/sources/testdata/testinput11
similarity index 100%
rename from jni/libpcre/testdata/testinput11
rename to jni/libpcre/sources/testdata/testinput11
diff --git a/jni/libpcre/testdata/testinput12 b/jni/libpcre/sources/testdata/testinput12
similarity index 100%
rename from jni/libpcre/testdata/testinput12
rename to jni/libpcre/sources/testdata/testinput12
diff --git a/jni/libpcre/testdata/testinput13 b/jni/libpcre/sources/testdata/testinput13
similarity index 100%
rename from jni/libpcre/testdata/testinput13
rename to jni/libpcre/sources/testdata/testinput13
diff --git a/jni/libpcre/testdata/testinput14 b/jni/libpcre/sources/testdata/testinput14
similarity index 100%
rename from jni/libpcre/testdata/testinput14
rename to jni/libpcre/sources/testdata/testinput14
diff --git a/jni/libpcre/testdata/testinput15 b/jni/libpcre/sources/testdata/testinput15
similarity index 100%
rename from jni/libpcre/testdata/testinput15
rename to jni/libpcre/sources/testdata/testinput15
diff --git a/jni/libpcre/testdata/testinput2 b/jni/libpcre/sources/testdata/testinput2
similarity index 100%
rename from jni/libpcre/testdata/testinput2
rename to jni/libpcre/sources/testdata/testinput2
diff --git a/jni/libpcre/testdata/testinput3 b/jni/libpcre/sources/testdata/testinput3
similarity index 100%
rename from jni/libpcre/testdata/testinput3
rename to jni/libpcre/sources/testdata/testinput3
diff --git a/jni/libpcre/testdata/testinput4 b/jni/libpcre/sources/testdata/testinput4
similarity index 100%
rename from jni/libpcre/testdata/testinput4
rename to jni/libpcre/sources/testdata/testinput4
diff --git a/jni/libpcre/testdata/testinput5 b/jni/libpcre/sources/testdata/testinput5
similarity index 100%
rename from jni/libpcre/testdata/testinput5
rename to jni/libpcre/sources/testdata/testinput5
Binary files differ
diff --git a/jni/libpcre/testdata/testinput6 b/jni/libpcre/sources/testdata/testinput6
similarity index 100%
rename from jni/libpcre/testdata/testinput6
rename to jni/libpcre/sources/testdata/testinput6
diff --git a/jni/libpcre/testdata/testinput7 b/jni/libpcre/sources/testdata/testinput7
similarity index 100%
rename from jni/libpcre/testdata/testinput7
rename to jni/libpcre/sources/testdata/testinput7
diff --git a/jni/libpcre/testdata/testinput8 b/jni/libpcre/sources/testdata/testinput8
similarity index 100%
rename from jni/libpcre/testdata/testinput8
rename to jni/libpcre/sources/testdata/testinput8
diff --git a/jni/libpcre/testdata/testinput9 b/jni/libpcre/sources/testdata/testinput9
similarity index 100%
rename from jni/libpcre/testdata/testinput9
rename to jni/libpcre/sources/testdata/testinput9
diff --git a/jni/libpcre/testdata/testoutput1 b/jni/libpcre/sources/testdata/testoutput1
similarity index 100%
rename from jni/libpcre/testdata/testoutput1
rename to jni/libpcre/sources/testdata/testoutput1
diff --git a/jni/libpcre/testdata/testoutput10 b/jni/libpcre/sources/testdata/testoutput10
similarity index 100%
rename from jni/libpcre/testdata/testoutput10
rename to jni/libpcre/sources/testdata/testoutput10
diff --git a/jni/libpcre/testdata/testoutput11 b/jni/libpcre/sources/testdata/testoutput11
similarity index 100%
rename from jni/libpcre/testdata/testoutput11
rename to jni/libpcre/sources/testdata/testoutput11
diff --git a/jni/libpcre/testdata/testoutput12 b/jni/libpcre/sources/testdata/testoutput12
similarity index 100%
rename from jni/libpcre/testdata/testoutput12
rename to jni/libpcre/sources/testdata/testoutput12
diff --git a/jni/libpcre/testdata/testoutput13 b/jni/libpcre/sources/testdata/testoutput13
similarity index 100%
rename from jni/libpcre/testdata/testoutput13
rename to jni/libpcre/sources/testdata/testoutput13
diff --git a/jni/libpcre/testdata/testoutput14 b/jni/libpcre/sources/testdata/testoutput14
similarity index 100%
rename from jni/libpcre/testdata/testoutput14
rename to jni/libpcre/sources/testdata/testoutput14
diff --git a/jni/libpcre/testdata/testoutput15 b/jni/libpcre/sources/testdata/testoutput15
similarity index 100%
rename from jni/libpcre/testdata/testoutput15
rename to jni/libpcre/sources/testdata/testoutput15
diff --git a/jni/libpcre/testdata/testoutput2 b/jni/libpcre/sources/testdata/testoutput2
similarity index 100%
rename from jni/libpcre/testdata/testoutput2
rename to jni/libpcre/sources/testdata/testoutput2
diff --git a/jni/libpcre/testdata/testoutput3 b/jni/libpcre/sources/testdata/testoutput3
similarity index 100%
rename from jni/libpcre/testdata/testoutput3
rename to jni/libpcre/sources/testdata/testoutput3
diff --git a/jni/libpcre/testdata/testoutput4 b/jni/libpcre/sources/testdata/testoutput4
similarity index 100%
rename from jni/libpcre/testdata/testoutput4
rename to jni/libpcre/sources/testdata/testoutput4
diff --git a/jni/libpcre/testdata/testoutput5 b/jni/libpcre/sources/testdata/testoutput5
similarity index 100%
rename from jni/libpcre/testdata/testoutput5
rename to jni/libpcre/sources/testdata/testoutput5
Binary files differ
diff --git a/jni/libpcre/testdata/testoutput6 b/jni/libpcre/sources/testdata/testoutput6
similarity index 100%
rename from jni/libpcre/testdata/testoutput6
rename to jni/libpcre/sources/testdata/testoutput6
diff --git a/jni/libpcre/testdata/testoutput7 b/jni/libpcre/sources/testdata/testoutput7
similarity index 100%
rename from jni/libpcre/testdata/testoutput7
rename to jni/libpcre/sources/testdata/testoutput7
diff --git a/jni/libpcre/testdata/testoutput8 b/jni/libpcre/sources/testdata/testoutput8
similarity index 100%
rename from jni/libpcre/testdata/testoutput8
rename to jni/libpcre/sources/testdata/testoutput8
diff --git a/jni/libpcre/testdata/testoutput9 b/jni/libpcre/sources/testdata/testoutput9
similarity index 100%
rename from jni/libpcre/testdata/testoutput9
rename to jni/libpcre/sources/testdata/testoutput9
diff --git a/jni/libpcre/testdata/wintestinput3 b/jni/libpcre/sources/testdata/wintestinput3
similarity index 100%
rename from jni/libpcre/testdata/wintestinput3
rename to jni/libpcre/sources/testdata/wintestinput3
diff --git a/jni/libpcre/testdata/wintestoutput3 b/jni/libpcre/sources/testdata/wintestoutput3
similarity index 100%
rename from jni/libpcre/testdata/wintestoutput3
rename to jni/libpcre/sources/testdata/wintestoutput3
diff --git a/jni/libpcre/ucp.h b/jni/libpcre/sources/ucp.h
similarity index 100%
rename from jni/libpcre/ucp.h
rename to jni/libpcre/sources/ucp.h
diff --git a/jni/libsamplerate/Android.mk b/jni/libsamplerate/Android.mk
index 8338432..3f2911e 100644
--- a/jni/libsamplerate/Android.mk
+++ b/jni/libsamplerate/Android.mk
@@ -1,2 +1,27 @@
-include $(call all-subdir-makefiles)
+include $(CLEAR_VARS)
 
+MY_LIBSAMPLE := libsamplerate/sources
+
+# We need to build this for both the device (as a shared library)
+# and the host (as a static library for tools to use).
+
+common_SRC_FILES := $(MY_LIBSAMPLE)/src/samplerate.c \
+                    $(MY_LIBSAMPLE)/src/src_sinc.c \
+					$(MY_LIBSAMPLE)/src/src_zoh.c \
+					$(MY_LIBSAMPLE)/src/src_linear.c
+
+# For the device
+# =====================================================
+
+# Device shared library
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(common_SRC_FILES)
+
+LOCAL_CFLAGS += -Werror -g
+
+LOCAL_C_INCLUDES += $(MY_LIBSAMPLE)
+
+LOCAL_MODULE:= libsamplerate
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/libsamplerate/AUTHORS b/jni/libsamplerate/sources/AUTHORS
similarity index 100%
rename from jni/libsamplerate/AUTHORS
rename to jni/libsamplerate/sources/AUTHORS
diff --git a/jni/libsamplerate/COPYING b/jni/libsamplerate/sources/COPYING
similarity index 100%
rename from jni/libsamplerate/COPYING
rename to jni/libsamplerate/sources/COPYING
diff --git a/jni/libsamplerate/Cfg/compile b/jni/libsamplerate/sources/Cfg/compile
similarity index 100%
rename from jni/libsamplerate/Cfg/compile
rename to jni/libsamplerate/sources/Cfg/compile
diff --git a/jni/libsamplerate/Cfg/config.guess b/jni/libsamplerate/sources/Cfg/config.guess
similarity index 100%
rename from jni/libsamplerate/Cfg/config.guess
rename to jni/libsamplerate/sources/Cfg/config.guess
diff --git a/jni/libsamplerate/Cfg/config.sub b/jni/libsamplerate/sources/Cfg/config.sub
similarity index 100%
rename from jni/libsamplerate/Cfg/config.sub
rename to jni/libsamplerate/sources/Cfg/config.sub
diff --git a/jni/libsamplerate/Cfg/depcomp b/jni/libsamplerate/sources/Cfg/depcomp
similarity index 100%
rename from jni/libsamplerate/Cfg/depcomp
rename to jni/libsamplerate/sources/Cfg/depcomp
diff --git a/jni/libsamplerate/Cfg/install-sh b/jni/libsamplerate/sources/Cfg/install-sh
similarity index 100%
rename from jni/libsamplerate/Cfg/install-sh
rename to jni/libsamplerate/sources/Cfg/install-sh
diff --git a/jni/libsamplerate/Cfg/ltmain.sh b/jni/libsamplerate/sources/Cfg/ltmain.sh
similarity index 100%
rename from jni/libsamplerate/Cfg/ltmain.sh
rename to jni/libsamplerate/sources/Cfg/ltmain.sh
diff --git a/jni/libsamplerate/Cfg/missing b/jni/libsamplerate/sources/Cfg/missing
similarity index 100%
rename from jni/libsamplerate/Cfg/missing
rename to jni/libsamplerate/sources/Cfg/missing
diff --git a/jni/libsamplerate/ChangeLog b/jni/libsamplerate/sources/ChangeLog
similarity index 100%
rename from jni/libsamplerate/ChangeLog
rename to jni/libsamplerate/sources/ChangeLog
diff --git a/jni/libsamplerate/INSTALL b/jni/libsamplerate/sources/INSTALL
similarity index 100%
rename from jni/libsamplerate/INSTALL
rename to jni/libsamplerate/sources/INSTALL
diff --git a/jni/libsamplerate/M4/Makefile.am b/jni/libsamplerate/sources/M4/Makefile.am
similarity index 100%
rename from jni/libsamplerate/M4/Makefile.am
rename to jni/libsamplerate/sources/M4/Makefile.am
diff --git a/jni/libsamplerate/M4/Makefile.in b/jni/libsamplerate/sources/M4/Makefile.in
similarity index 100%
rename from jni/libsamplerate/M4/Makefile.in
rename to jni/libsamplerate/sources/M4/Makefile.in
diff --git a/jni/libsamplerate/M4/add_cflags.m4 b/jni/libsamplerate/sources/M4/add_cflags.m4
similarity index 100%
rename from jni/libsamplerate/M4/add_cflags.m4
rename to jni/libsamplerate/sources/M4/add_cflags.m4
diff --git a/jni/libsamplerate/M4/check_signal.m4 b/jni/libsamplerate/sources/M4/check_signal.m4
similarity index 100%
rename from jni/libsamplerate/M4/check_signal.m4
rename to jni/libsamplerate/sources/M4/check_signal.m4
diff --git a/jni/libsamplerate/M4/clip_mode.m4 b/jni/libsamplerate/sources/M4/clip_mode.m4
similarity index 100%
rename from jni/libsamplerate/M4/clip_mode.m4
rename to jni/libsamplerate/sources/M4/clip_mode.m4
diff --git a/jni/libsamplerate/M4/endian.m4 b/jni/libsamplerate/sources/M4/endian.m4
similarity index 100%
rename from jni/libsamplerate/M4/endian.m4
rename to jni/libsamplerate/sources/M4/endian.m4
diff --git a/jni/libsamplerate/M4/libtool.m4 b/jni/libsamplerate/sources/M4/libtool.m4
similarity index 100%
rename from jni/libsamplerate/M4/libtool.m4
rename to jni/libsamplerate/sources/M4/libtool.m4
diff --git a/jni/libsamplerate/M4/lrint.m4 b/jni/libsamplerate/sources/M4/lrint.m4
similarity index 100%
rename from jni/libsamplerate/M4/lrint.m4
rename to jni/libsamplerate/sources/M4/lrint.m4
diff --git a/jni/libsamplerate/M4/lrintf.m4 b/jni/libsamplerate/sources/M4/lrintf.m4
similarity index 100%
rename from jni/libsamplerate/M4/lrintf.m4
rename to jni/libsamplerate/sources/M4/lrintf.m4
diff --git a/jni/libsamplerate/M4/ltoptions.m4 b/jni/libsamplerate/sources/M4/ltoptions.m4
similarity index 100%
rename from jni/libsamplerate/M4/ltoptions.m4
rename to jni/libsamplerate/sources/M4/ltoptions.m4
diff --git a/jni/libsamplerate/M4/ltsugar.m4 b/jni/libsamplerate/sources/M4/ltsugar.m4
similarity index 100%
rename from jni/libsamplerate/M4/ltsugar.m4
rename to jni/libsamplerate/sources/M4/ltsugar.m4
diff --git a/jni/libsamplerate/M4/ltversion.m4 b/jni/libsamplerate/sources/M4/ltversion.m4
similarity index 100%
rename from jni/libsamplerate/M4/ltversion.m4
rename to jni/libsamplerate/sources/M4/ltversion.m4
diff --git a/jni/libsamplerate/M4/lt~obsolete.m4 b/jni/libsamplerate/sources/M4/lt~obsolete.m4
similarity index 100%
rename from jni/libsamplerate/M4/lt~obsolete.m4
rename to jni/libsamplerate/sources/M4/lt~obsolete.m4
diff --git a/jni/libsamplerate/Make.bat b/jni/libsamplerate/sources/Make.bat
similarity index 100%
rename from jni/libsamplerate/Make.bat
rename to jni/libsamplerate/sources/Make.bat
diff --git a/jni/libsamplerate/Makefile.am b/jni/libsamplerate/sources/Makefile.am
similarity index 100%
rename from jni/libsamplerate/Makefile.am
rename to jni/libsamplerate/sources/Makefile.am
diff --git a/jni/libsamplerate/Makefile.in b/jni/libsamplerate/sources/Makefile.in
similarity index 100%
rename from jni/libsamplerate/Makefile.in
rename to jni/libsamplerate/sources/Makefile.in
diff --git a/jni/libsamplerate/NEWS b/jni/libsamplerate/sources/NEWS
similarity index 100%
rename from jni/libsamplerate/NEWS
rename to jni/libsamplerate/sources/NEWS
diff --git a/jni/libsamplerate/README b/jni/libsamplerate/sources/README
similarity index 100%
rename from jni/libsamplerate/README
rename to jni/libsamplerate/sources/README
diff --git a/jni/libsamplerate/Win32/Makefile.am b/jni/libsamplerate/sources/Win32/Makefile.am
similarity index 100%
rename from jni/libsamplerate/Win32/Makefile.am
rename to jni/libsamplerate/sources/Win32/Makefile.am
diff --git a/jni/libsamplerate/Win32/Makefile.in b/jni/libsamplerate/sources/Win32/Makefile.in
similarity index 100%
rename from jni/libsamplerate/Win32/Makefile.in
rename to jni/libsamplerate/sources/Win32/Makefile.in
diff --git a/jni/libsamplerate/Win32/Makefile.mingw.in b/jni/libsamplerate/sources/Win32/Makefile.mingw.in
similarity index 100%
rename from jni/libsamplerate/Win32/Makefile.mingw.in
rename to jni/libsamplerate/sources/Win32/Makefile.mingw.in
diff --git a/jni/libsamplerate/Win32/Makefile.msvc b/jni/libsamplerate/sources/Win32/Makefile.msvc
similarity index 100%
rename from jni/libsamplerate/Win32/Makefile.msvc
rename to jni/libsamplerate/sources/Win32/Makefile.msvc
diff --git a/jni/libsamplerate/Win32/config.h b/jni/libsamplerate/sources/Win32/config.h
similarity index 100%
rename from jni/libsamplerate/Win32/config.h
rename to jni/libsamplerate/sources/Win32/config.h
diff --git a/jni/libsamplerate/Win32/libsamplerate-0.def b/jni/libsamplerate/sources/Win32/libsamplerate-0.def
similarity index 100%
rename from jni/libsamplerate/Win32/libsamplerate-0.def
rename to jni/libsamplerate/sources/Win32/libsamplerate-0.def
diff --git a/jni/libsamplerate/Win32/unistd.h b/jni/libsamplerate/sources/Win32/unistd.h
similarity index 100%
rename from jni/libsamplerate/Win32/unistd.h
rename to jni/libsamplerate/sources/Win32/unistd.h
diff --git a/jni/libsamplerate/aclocal.m4 b/jni/libsamplerate/sources/aclocal.m4
similarity index 100%
rename from jni/libsamplerate/aclocal.m4
rename to jni/libsamplerate/sources/aclocal.m4
diff --git a/jni/libsamplerate/autogen.sh b/jni/libsamplerate/sources/autogen.sh
similarity index 100%
rename from jni/libsamplerate/autogen.sh
rename to jni/libsamplerate/sources/autogen.sh
diff --git a/jni/libsamplerate/autom4te.cache/output.0 b/jni/libsamplerate/sources/autom4te.cache/output.0
similarity index 100%
rename from jni/libsamplerate/autom4te.cache/output.0
rename to jni/libsamplerate/sources/autom4te.cache/output.0
diff --git a/jni/libsamplerate/autom4te.cache/output.1 b/jni/libsamplerate/sources/autom4te.cache/output.1
similarity index 100%
rename from jni/libsamplerate/autom4te.cache/output.1
rename to jni/libsamplerate/sources/autom4te.cache/output.1
diff --git a/jni/libsamplerate/autom4te.cache/requests b/jni/libsamplerate/sources/autom4te.cache/requests
similarity index 100%
rename from jni/libsamplerate/autom4te.cache/requests
rename to jni/libsamplerate/sources/autom4te.cache/requests
diff --git a/jni/libsamplerate/autom4te.cache/traces.0 b/jni/libsamplerate/sources/autom4te.cache/traces.0
similarity index 100%
rename from jni/libsamplerate/autom4te.cache/traces.0
rename to jni/libsamplerate/sources/autom4te.cache/traces.0
diff --git a/jni/libsamplerate/autom4te.cache/traces.1 b/jni/libsamplerate/sources/autom4te.cache/traces.1
similarity index 100%
rename from jni/libsamplerate/autom4te.cache/traces.1
rename to jni/libsamplerate/sources/autom4te.cache/traces.1
diff --git a/jni/libsamplerate/config.h b/jni/libsamplerate/sources/config.h
similarity index 100%
rename from jni/libsamplerate/config.h
rename to jni/libsamplerate/sources/config.h
diff --git a/jni/libsamplerate/config.log b/jni/libsamplerate/sources/config.log
similarity index 100%
rename from jni/libsamplerate/config.log
rename to jni/libsamplerate/sources/config.log
diff --git a/jni/libsamplerate/configure b/jni/libsamplerate/sources/configure
similarity index 100%
rename from jni/libsamplerate/configure
rename to jni/libsamplerate/sources/configure
diff --git a/jni/libsamplerate/configure.ac b/jni/libsamplerate/sources/configure.ac
similarity index 100%
rename from jni/libsamplerate/configure.ac
rename to jni/libsamplerate/sources/configure.ac
diff --git a/jni/libsamplerate/doc/ChangeLog b/jni/libsamplerate/sources/doc/ChangeLog
similarity index 100%
rename from jni/libsamplerate/doc/ChangeLog
rename to jni/libsamplerate/sources/doc/ChangeLog
diff --git a/jni/libsamplerate/doc/Makefile.am b/jni/libsamplerate/sources/doc/Makefile.am
similarity index 100%
rename from jni/libsamplerate/doc/Makefile.am
rename to jni/libsamplerate/sources/doc/Makefile.am
diff --git a/jni/libsamplerate/doc/Makefile.in b/jni/libsamplerate/sources/doc/Makefile.in
similarity index 100%
rename from jni/libsamplerate/doc/Makefile.in
rename to jni/libsamplerate/sources/doc/Makefile.in
diff --git a/jni/libsamplerate/doc/NEWS b/jni/libsamplerate/sources/doc/NEWS
similarity index 100%
rename from jni/libsamplerate/doc/NEWS
rename to jni/libsamplerate/sources/doc/NEWS
diff --git a/jni/libsamplerate/doc/SRC.css b/jni/libsamplerate/sources/doc/SRC.css
similarity index 100%
rename from jni/libsamplerate/doc/SRC.css
rename to jni/libsamplerate/sources/doc/SRC.css
diff --git a/jni/libsamplerate/doc/SRC.png b/jni/libsamplerate/sources/doc/SRC.png
similarity index 100%
rename from jni/libsamplerate/doc/SRC.png
rename to jni/libsamplerate/sources/doc/SRC.png
Binary files differ
diff --git a/jni/libsamplerate/doc/api.html b/jni/libsamplerate/sources/doc/api.html
similarity index 100%
rename from jni/libsamplerate/doc/api.html
rename to jni/libsamplerate/sources/doc/api.html
diff --git a/jni/libsamplerate/doc/api_callback.html b/jni/libsamplerate/sources/doc/api_callback.html
similarity index 100%
rename from jni/libsamplerate/doc/api_callback.html
rename to jni/libsamplerate/sources/doc/api_callback.html
diff --git a/jni/libsamplerate/doc/api_full.html b/jni/libsamplerate/sources/doc/api_full.html
similarity index 100%
rename from jni/libsamplerate/doc/api_full.html
rename to jni/libsamplerate/sources/doc/api_full.html
diff --git a/jni/libsamplerate/doc/api_misc.html b/jni/libsamplerate/sources/doc/api_misc.html
similarity index 100%
rename from jni/libsamplerate/doc/api_misc.html
rename to jni/libsamplerate/sources/doc/api_misc.html
diff --git a/jni/libsamplerate/doc/api_simple.html b/jni/libsamplerate/sources/doc/api_simple.html
similarity index 100%
rename from jni/libsamplerate/doc/api_simple.html
rename to jni/libsamplerate/sources/doc/api_simple.html
diff --git a/jni/libsamplerate/doc/download.html b/jni/libsamplerate/sources/doc/download.html
similarity index 100%
rename from jni/libsamplerate/doc/download.html
rename to jni/libsamplerate/sources/doc/download.html
diff --git a/jni/libsamplerate/doc/faq.html b/jni/libsamplerate/sources/doc/faq.html
similarity index 100%
rename from jni/libsamplerate/doc/faq.html
rename to jni/libsamplerate/sources/doc/faq.html
diff --git a/jni/libsamplerate/doc/history.html b/jni/libsamplerate/sources/doc/history.html
similarity index 100%
rename from jni/libsamplerate/doc/history.html
rename to jni/libsamplerate/sources/doc/history.html
diff --git a/jni/libsamplerate/doc/index.html b/jni/libsamplerate/sources/doc/index.html
similarity index 100%
rename from jni/libsamplerate/doc/index.html
rename to jni/libsamplerate/sources/doc/index.html
diff --git a/jni/libsamplerate/doc/license.html b/jni/libsamplerate/sources/doc/license.html
similarity index 100%
rename from jni/libsamplerate/doc/license.html
rename to jni/libsamplerate/sources/doc/license.html
diff --git a/jni/libsamplerate/doc/lists.html b/jni/libsamplerate/sources/doc/lists.html
similarity index 100%
rename from jni/libsamplerate/doc/lists.html
rename to jni/libsamplerate/sources/doc/lists.html
diff --git a/jni/libsamplerate/doc/quality.html b/jni/libsamplerate/sources/doc/quality.html
similarity index 100%
rename from jni/libsamplerate/doc/quality.html
rename to jni/libsamplerate/sources/doc/quality.html
diff --git a/jni/libsamplerate/doc/win32.html b/jni/libsamplerate/sources/doc/win32.html
similarity index 100%
rename from jni/libsamplerate/doc/win32.html
rename to jni/libsamplerate/sources/doc/win32.html
diff --git a/jni/libsamplerate/examples/Makefile.am b/jni/libsamplerate/sources/examples/Makefile.am
similarity index 100%
rename from jni/libsamplerate/examples/Makefile.am
rename to jni/libsamplerate/sources/examples/Makefile.am
diff --git a/jni/libsamplerate/examples/Makefile.in b/jni/libsamplerate/sources/examples/Makefile.in
similarity index 100%
rename from jni/libsamplerate/examples/Makefile.in
rename to jni/libsamplerate/sources/examples/Makefile.in
diff --git a/jni/libsamplerate/examples/audio_out.c b/jni/libsamplerate/sources/examples/audio_out.c
similarity index 100%
rename from jni/libsamplerate/examples/audio_out.c
rename to jni/libsamplerate/sources/examples/audio_out.c
diff --git a/jni/libsamplerate/examples/audio_out.h b/jni/libsamplerate/sources/examples/audio_out.h
similarity index 100%
rename from jni/libsamplerate/examples/audio_out.h
rename to jni/libsamplerate/sources/examples/audio_out.h
diff --git a/jni/libsamplerate/examples/sndfile-resample.c b/jni/libsamplerate/sources/examples/sndfile-resample.c
similarity index 100%
rename from jni/libsamplerate/examples/sndfile-resample.c
rename to jni/libsamplerate/sources/examples/sndfile-resample.c
diff --git a/jni/libsamplerate/examples/timewarp-file.c b/jni/libsamplerate/sources/examples/timewarp-file.c
similarity index 100%
rename from jni/libsamplerate/examples/timewarp-file.c
rename to jni/libsamplerate/sources/examples/timewarp-file.c
diff --git a/jni/libsamplerate/examples/varispeed-play.c b/jni/libsamplerate/sources/examples/varispeed-play.c
similarity index 100%
rename from jni/libsamplerate/examples/varispeed-play.c
rename to jni/libsamplerate/sources/examples/varispeed-play.c
diff --git a/jni/libsamplerate/libsamplerate.spec.in b/jni/libsamplerate/sources/libsamplerate.spec.in
similarity index 100%
rename from jni/libsamplerate/libsamplerate.spec.in
rename to jni/libsamplerate/sources/libsamplerate.spec.in
diff --git a/jni/libsamplerate/samplerate.pc.in b/jni/libsamplerate/sources/samplerate.pc.in
similarity index 100%
rename from jni/libsamplerate/samplerate.pc.in
rename to jni/libsamplerate/sources/samplerate.pc.in
diff --git a/jni/libsamplerate/src/Makefile.am b/jni/libsamplerate/sources/src/Makefile.am
similarity index 100%
rename from jni/libsamplerate/src/Makefile.am
rename to jni/libsamplerate/sources/src/Makefile.am
diff --git a/jni/libsamplerate/src/Makefile.in b/jni/libsamplerate/sources/src/Makefile.in
similarity index 100%
rename from jni/libsamplerate/src/Makefile.in
rename to jni/libsamplerate/sources/src/Makefile.in
diff --git a/jni/libsamplerate/src/Version_script.in b/jni/libsamplerate/sources/src/Version_script.in
similarity index 100%
rename from jni/libsamplerate/src/Version_script.in
rename to jni/libsamplerate/sources/src/Version_script.in
diff --git a/jni/libsamplerate/src/check_asm.sh b/jni/libsamplerate/sources/src/check_asm.sh
similarity index 100%
rename from jni/libsamplerate/src/check_asm.sh
rename to jni/libsamplerate/sources/src/check_asm.sh
diff --git a/jni/libsamplerate/src/common.h b/jni/libsamplerate/sources/src/common.h
similarity index 100%
rename from jni/libsamplerate/src/common.h
rename to jni/libsamplerate/sources/src/common.h
diff --git a/jni/libsamplerate/src/config.h.in b/jni/libsamplerate/sources/src/config.h.in
similarity index 100%
rename from jni/libsamplerate/src/config.h.in
rename to jni/libsamplerate/sources/src/config.h.in
diff --git a/jni/libsamplerate/src/fastest_coeffs.h b/jni/libsamplerate/sources/src/fastest_coeffs.h
similarity index 100%
rename from jni/libsamplerate/src/fastest_coeffs.h
rename to jni/libsamplerate/sources/src/fastest_coeffs.h
diff --git a/jni/libsamplerate/src/float_cast.h b/jni/libsamplerate/sources/src/float_cast.h
similarity index 100%
rename from jni/libsamplerate/src/float_cast.h
rename to jni/libsamplerate/sources/src/float_cast.h
diff --git a/jni/libsamplerate/src/high_qual_coeffs.h b/jni/libsamplerate/sources/src/high_qual_coeffs.h
similarity index 100%
rename from jni/libsamplerate/src/high_qual_coeffs.h
rename to jni/libsamplerate/sources/src/high_qual_coeffs.h
diff --git a/jni/libsamplerate/src/mid_qual_coeffs.h b/jni/libsamplerate/sources/src/mid_qual_coeffs.h
similarity index 100%
rename from jni/libsamplerate/src/mid_qual_coeffs.h
rename to jni/libsamplerate/sources/src/mid_qual_coeffs.h
diff --git a/jni/libsamplerate/src/samplerate.c b/jni/libsamplerate/sources/src/samplerate.c
similarity index 100%
rename from jni/libsamplerate/src/samplerate.c
rename to jni/libsamplerate/sources/src/samplerate.c
diff --git a/jni/libsamplerate/src/samplerate.h b/jni/libsamplerate/sources/src/samplerate.h
similarity index 100%
rename from jni/libsamplerate/src/samplerate.h
rename to jni/libsamplerate/sources/src/samplerate.h
diff --git a/jni/libsamplerate/src/src_linear.c b/jni/libsamplerate/sources/src/src_linear.c
similarity index 100%
rename from jni/libsamplerate/src/src_linear.c
rename to jni/libsamplerate/sources/src/src_linear.c
diff --git a/jni/libsamplerate/src/src_sinc.c b/jni/libsamplerate/sources/src/src_sinc.c
similarity index 100%
rename from jni/libsamplerate/src/src_sinc.c
rename to jni/libsamplerate/sources/src/src_sinc.c
diff --git a/jni/libsamplerate/src/src_zoh.c b/jni/libsamplerate/sources/src/src_zoh.c
similarity index 100%
rename from jni/libsamplerate/src/src_zoh.c
rename to jni/libsamplerate/sources/src/src_zoh.c
diff --git a/jni/libsamplerate/tests/Makefile.am b/jni/libsamplerate/sources/tests/Makefile.am
similarity index 100%
rename from jni/libsamplerate/tests/Makefile.am
rename to jni/libsamplerate/sources/tests/Makefile.am
diff --git a/jni/libsamplerate/tests/Makefile.in b/jni/libsamplerate/sources/tests/Makefile.in
similarity index 100%
rename from jni/libsamplerate/tests/Makefile.in
rename to jni/libsamplerate/sources/tests/Makefile.in
diff --git a/jni/libsamplerate/tests/calc_snr.c b/jni/libsamplerate/sources/tests/calc_snr.c
similarity index 100%
rename from jni/libsamplerate/tests/calc_snr.c
rename to jni/libsamplerate/sources/tests/calc_snr.c
diff --git a/jni/libsamplerate/tests/callback_hang_test.c b/jni/libsamplerate/sources/tests/callback_hang_test.c
similarity index 100%
rename from jni/libsamplerate/tests/callback_hang_test.c
rename to jni/libsamplerate/sources/tests/callback_hang_test.c
diff --git a/jni/libsamplerate/tests/callback_test.c b/jni/libsamplerate/sources/tests/callback_test.c
similarity index 100%
rename from jni/libsamplerate/tests/callback_test.c
rename to jni/libsamplerate/sources/tests/callback_test.c
diff --git a/jni/libsamplerate/tests/downsample_test.c b/jni/libsamplerate/sources/tests/downsample_test.c
similarity index 100%
rename from jni/libsamplerate/tests/downsample_test.c
rename to jni/libsamplerate/sources/tests/downsample_test.c
diff --git a/jni/libsamplerate/tests/float_short_test.c b/jni/libsamplerate/sources/tests/float_short_test.c
similarity index 100%
rename from jni/libsamplerate/tests/float_short_test.c
rename to jni/libsamplerate/sources/tests/float_short_test.c
diff --git a/jni/libsamplerate/tests/misc_test.c b/jni/libsamplerate/sources/tests/misc_test.c
similarity index 100%
rename from jni/libsamplerate/tests/misc_test.c
rename to jni/libsamplerate/sources/tests/misc_test.c
diff --git a/jni/libsamplerate/tests/multi_channel_test.c b/jni/libsamplerate/sources/tests/multi_channel_test.c
similarity index 100%
rename from jni/libsamplerate/tests/multi_channel_test.c
rename to jni/libsamplerate/sources/tests/multi_channel_test.c
diff --git a/jni/libsamplerate/tests/multichan_throughput_test.c b/jni/libsamplerate/sources/tests/multichan_throughput_test.c
similarity index 100%
rename from jni/libsamplerate/tests/multichan_throughput_test.c
rename to jni/libsamplerate/sources/tests/multichan_throughput_test.c
diff --git a/jni/libsamplerate/tests/reset_test.c b/jni/libsamplerate/sources/tests/reset_test.c
similarity index 100%
rename from jni/libsamplerate/tests/reset_test.c
rename to jni/libsamplerate/sources/tests/reset_test.c
diff --git a/jni/libsamplerate/tests/simple_test.c b/jni/libsamplerate/sources/tests/simple_test.c
similarity index 100%
rename from jni/libsamplerate/tests/simple_test.c
rename to jni/libsamplerate/sources/tests/simple_test.c
diff --git a/jni/libsamplerate/tests/snr_bw_test.c b/jni/libsamplerate/sources/tests/snr_bw_test.c
similarity index 100%
rename from jni/libsamplerate/tests/snr_bw_test.c
rename to jni/libsamplerate/sources/tests/snr_bw_test.c
diff --git a/jni/libsamplerate/tests/src-evaluate.c b/jni/libsamplerate/sources/tests/src-evaluate.c
similarity index 100%
rename from jni/libsamplerate/tests/src-evaluate.c
rename to jni/libsamplerate/sources/tests/src-evaluate.c
diff --git a/jni/libsamplerate/tests/termination_test.c b/jni/libsamplerate/sources/tests/termination_test.c
similarity index 100%
rename from jni/libsamplerate/tests/termination_test.c
rename to jni/libsamplerate/sources/tests/termination_test.c
diff --git a/jni/libsamplerate/tests/throughput_test.c b/jni/libsamplerate/sources/tests/throughput_test.c
similarity index 100%
rename from jni/libsamplerate/tests/throughput_test.c
rename to jni/libsamplerate/sources/tests/throughput_test.c
diff --git a/jni/libsamplerate/tests/util.c b/jni/libsamplerate/sources/tests/util.c
similarity index 100%
rename from jni/libsamplerate/tests/util.c
rename to jni/libsamplerate/sources/tests/util.c
diff --git a/jni/libsamplerate/tests/util.h b/jni/libsamplerate/sources/tests/util.h
similarity index 100%
rename from jni/libsamplerate/tests/util.h
rename to jni/libsamplerate/sources/tests/util.h
diff --git a/jni/libsamplerate/tests/varispeed_test.c b/jni/libsamplerate/sources/tests/varispeed_test.c
similarity index 100%
rename from jni/libsamplerate/tests/varispeed_test.c
rename to jni/libsamplerate/sources/tests/varispeed_test.c
diff --git a/jni/libsamplerate/src/Android.mk b/jni/libsamplerate/src/Android.mk
deleted file mode 100644
index afa8acc..0000000
--- a/jni/libsamplerate/src/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-# We need to build this for both the device (as a shared library)
-# and the host (as a static library for tools to use).
-
-common_SRC_FILES := samplerate.c \
-                    src_sinc.c \
-					src_zoh.c \
-					src_linear.c
-
-# For the device
-# =====================================================
-
-# Device shared library
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_CFLAGS += -Werror -g
-LOCAL_LDFLAGS := 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-
-LOCAL_MODULE:= libsamplerate
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/libsndfile/Android.mk b/jni/libsndfile/Android.mk
new file mode 100644
index 0000000..c475de8
--- /dev/null
+++ b/jni/libsndfile/Android.mk
@@ -0,0 +1,58 @@
+include $(CLEAR_VARS)
+
+MY_LIBSNDFILE = libsndfile/sources
+
+LOCAL_MODULE   := libsndfile
+
+LOCAL_SRC_FILES := 	$(MY_LIBSNDFILE)/src/mat5.c \
+					$(MY_LIBSNDFILE)/src/windows.c \
+					$(MY_LIBSNDFILE)/src/G72x/g723_24.c \
+					$(MY_LIBSNDFILE)/src/G72x/g72x.c \
+					$(MY_LIBSNDFILE)/src/G72x/g723_40.c \
+					$(MY_LIBSNDFILE)/src/G72x/g721.c \
+					$(MY_LIBSNDFILE)/src/G72x/g723_16.c \
+					$(MY_LIBSNDFILE)/src/float32.c \
+					$(MY_LIBSNDFILE)/src/chanmap.c $(MY_LIBSNDFILE)/src/test_endswap.c $(MY_LIBSNDFILE)/src/rf64.c \
+					$(MY_LIBSNDFILE)/src/sndfile.c \
+					$(MY_LIBSNDFILE)/src/htk.c $(MY_LIBSNDFILE)/src/dither.c \
+       				$(MY_LIBSNDFILE)/src/test_log_printf.c $(MY_LIBSNDFILE)/src/txw.c \
+					$(MY_LIBSNDFILE)/src/ms_adpcm.c $(MY_LIBSNDFILE)/src/ima_adpcm.c \
+					$(MY_LIBSNDFILE)/src/flac.c $(MY_LIBSNDFILE)/src/aiff.c \
+					$(MY_LIBSNDFILE)/src/wav.c \
+					$(MY_LIBSNDFILE)/src/macbinary3.c \
+					$(MY_LIBSNDFILE)/src/mat4.c \
+					$(MY_LIBSNDFILE)/src/pcm.c \
+					$(MY_LIBSNDFILE)/src/caf.c \
+					$(MY_LIBSNDFILE)/src/audio_detect.c \
+					$(MY_LIBSNDFILE)/src/id3.c \
+					$(MY_LIBSNDFILE)/src/alaw.c $(MY_LIBSNDFILE)/src/macos.c $(MY_LIBSNDFILE)/src/file_io.c $(MY_LIBSNDFILE)/src/broadcast.c \
+					$(MY_LIBSNDFILE)/src/double64.c \
+					$(MY_LIBSNDFILE)/src/raw.c $(MY_LIBSNDFILE)/src/test_broadcast_var.c \
+					$(MY_LIBSNDFILE)/src/g72x.c $(MY_LIBSNDFILE)/src/command.c \
+					$(MY_LIBSNDFILE)/src/chunk.c $(MY_LIBSNDFILE)/src/avr.c \
+					$(MY_LIBSNDFILE)/src/sd2.c $(MY_LIBSNDFILE)/src/voc.c \
+					$(MY_LIBSNDFILE)/src/test_audio_detect.c \
+					$(MY_LIBSNDFILE)/src/mpc2k.c $(MY_LIBSNDFILE)/src/gsm610.c $(MY_LIBSNDFILE)/src/dwd.c \
+					$(MY_LIBSNDFILE)/src/interleave.c $(MY_LIBSNDFILE)/src/common.c \
+					$(MY_LIBSNDFILE)/src/test_strncpy_crlf.c $(MY_LIBSNDFILE)/src/sds.c \
+					$(MY_LIBSNDFILE)/src/pvf.c $(MY_LIBSNDFILE)/src/paf.c \
+					$(MY_LIBSNDFILE)/src/au.c \
+					$(MY_LIBSNDFILE)/src/test_float.c \
+					$(MY_LIBSNDFILE)/src/vox_adpcm.c $(MY_LIBSNDFILE)/src/ulaw.c \
+					$(MY_LIBSNDFILE)/src/strings.c $(MY_LIBSNDFILE)/src/svx.c \
+					$(MY_LIBSNDFILE)/src/test_conversions.c $(MY_LIBSNDFILE)/src/rx2.c \
+					$(MY_LIBSNDFILE)/src/nist.c \
+					$(MY_LIBSNDFILE)/src/GSM610/code.c $(MY_LIBSNDFILE)/src/GSM610/gsm_destroy.c \
+					$(MY_LIBSNDFILE)/src/GSM610/gsm_decode.c $(MY_LIBSNDFILE)/src/GSM610/short_term.c $(MY_LIBSNDFILE)/src/GSM610/gsm_create.c \
+					$(MY_LIBSNDFILE)/src/GSM610/decode.c $(MY_LIBSNDFILE)/src/GSM610/gsm_option.c \
+					$(MY_LIBSNDFILE)/src/GSM610/long_term.c $(MY_LIBSNDFILE)/src/GSM610/table.c $(MY_LIBSNDFILE)/src/GSM610/rpe.c $(MY_LIBSNDFILE)/src/GSM610/preprocess.c \
+					$(MY_LIBSNDFILE)/src/GSM610/gsm_encode.c $(MY_LIBSNDFILE)/src/GSM610/lpc.c \
+					$(MY_LIBSNDFILE)/src/GSM610/add.c $(MY_LIBSNDFILE)/src/dwvw.c \
+					$(MY_LIBSNDFILE)/src/wav_w64.c $(MY_LIBSNDFILE)/src/wve.c $(MY_LIBSNDFILE)/src/ogg.c $(MY_LIBSNDFILE)/src/w64.c \
+					$(MY_LIBSNDFILE)/src/test_file_io.c \
+					$(MY_LIBSNDFILE)/src/ircam.c $(MY_LIBSNDFILE)/src/xi.c $(MY_LIBSNDFILE)/src/ima_oki_adpcm.c
+
+LOCAL_C_INCLUDES += $(MY_LIBSNDFILE)/src \
+					$(APP_PROJECT_PATH)/jni/sflphone/daemon/src
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libsndfile/AUTHORS b/jni/libsndfile/sources/AUTHORS
similarity index 100%
rename from jni/libsndfile/AUTHORS
rename to jni/libsndfile/sources/AUTHORS
diff --git a/jni/libsndfile/COPYING b/jni/libsndfile/sources/COPYING
similarity index 100%
rename from jni/libsndfile/COPYING
rename to jni/libsndfile/sources/COPYING
diff --git a/jni/libsndfile/Cfg/compile b/jni/libsndfile/sources/Cfg/compile
similarity index 100%
rename from jni/libsndfile/Cfg/compile
rename to jni/libsndfile/sources/Cfg/compile
diff --git a/jni/libsndfile/Cfg/config.guess b/jni/libsndfile/sources/Cfg/config.guess
similarity index 100%
rename from jni/libsndfile/Cfg/config.guess
rename to jni/libsndfile/sources/Cfg/config.guess
diff --git a/jni/libsndfile/Cfg/config.sub b/jni/libsndfile/sources/Cfg/config.sub
similarity index 100%
rename from jni/libsndfile/Cfg/config.sub
rename to jni/libsndfile/sources/Cfg/config.sub
diff --git a/jni/libsndfile/Cfg/depcomp b/jni/libsndfile/sources/Cfg/depcomp
similarity index 100%
rename from jni/libsndfile/Cfg/depcomp
rename to jni/libsndfile/sources/Cfg/depcomp
diff --git a/jni/libsndfile/Cfg/install-sh b/jni/libsndfile/sources/Cfg/install-sh
similarity index 100%
rename from jni/libsndfile/Cfg/install-sh
rename to jni/libsndfile/sources/Cfg/install-sh
diff --git a/jni/libsndfile/Cfg/ltmain.sh b/jni/libsndfile/sources/Cfg/ltmain.sh
similarity index 100%
rename from jni/libsndfile/Cfg/ltmain.sh
rename to jni/libsndfile/sources/Cfg/ltmain.sh
diff --git a/jni/libsndfile/Cfg/missing b/jni/libsndfile/sources/Cfg/missing
similarity index 100%
rename from jni/libsndfile/Cfg/missing
rename to jni/libsndfile/sources/Cfg/missing
diff --git a/jni/libsndfile/ChangeLog b/jni/libsndfile/sources/ChangeLog
similarity index 100%
rename from jni/libsndfile/ChangeLog
rename to jni/libsndfile/sources/ChangeLog
diff --git a/jni/libsndfile/INSTALL b/jni/libsndfile/sources/INSTALL
similarity index 100%
rename from jni/libsndfile/INSTALL
rename to jni/libsndfile/sources/INSTALL
diff --git a/jni/libsndfile/M4/Makefile b/jni/libsndfile/sources/M4/Makefile
similarity index 100%
rename from jni/libsndfile/M4/Makefile
rename to jni/libsndfile/sources/M4/Makefile
diff --git a/jni/libsndfile/M4/Makefile.am b/jni/libsndfile/sources/M4/Makefile.am
similarity index 100%
rename from jni/libsndfile/M4/Makefile.am
rename to jni/libsndfile/sources/M4/Makefile.am
diff --git a/jni/libsndfile/M4/Makefile.in b/jni/libsndfile/sources/M4/Makefile.in
similarity index 100%
rename from jni/libsndfile/M4/Makefile.in
rename to jni/libsndfile/sources/M4/Makefile.in
diff --git a/jni/libsndfile/M4/add_cflags.m4 b/jni/libsndfile/sources/M4/add_cflags.m4
similarity index 100%
rename from jni/libsndfile/M4/add_cflags.m4
rename to jni/libsndfile/sources/M4/add_cflags.m4
diff --git a/jni/libsndfile/M4/add_cxxflags.m4 b/jni/libsndfile/sources/M4/add_cxxflags.m4
similarity index 100%
rename from jni/libsndfile/M4/add_cxxflags.m4
rename to jni/libsndfile/sources/M4/add_cxxflags.m4
diff --git a/jni/libsndfile/M4/clip_mode.m4 b/jni/libsndfile/sources/M4/clip_mode.m4
similarity index 100%
rename from jni/libsndfile/M4/clip_mode.m4
rename to jni/libsndfile/sources/M4/clip_mode.m4
diff --git a/jni/libsndfile/M4/endian.m4 b/jni/libsndfile/sources/M4/endian.m4
similarity index 100%
rename from jni/libsndfile/M4/endian.m4
rename to jni/libsndfile/sources/M4/endian.m4
diff --git a/jni/libsndfile/M4/extra_largefile.m4 b/jni/libsndfile/sources/M4/extra_largefile.m4
similarity index 100%
rename from jni/libsndfile/M4/extra_largefile.m4
rename to jni/libsndfile/sources/M4/extra_largefile.m4
diff --git a/jni/libsndfile/M4/extra_pkg.m4 b/jni/libsndfile/sources/M4/extra_pkg.m4
similarity index 100%
rename from jni/libsndfile/M4/extra_pkg.m4
rename to jni/libsndfile/sources/M4/extra_pkg.m4
diff --git a/jni/libsndfile/M4/flexible_array.m4 b/jni/libsndfile/sources/M4/flexible_array.m4
similarity index 100%
rename from jni/libsndfile/M4/flexible_array.m4
rename to jni/libsndfile/sources/M4/flexible_array.m4
diff --git a/jni/libsndfile/M4/gcc_version.m4 b/jni/libsndfile/sources/M4/gcc_version.m4
similarity index 100%
rename from jni/libsndfile/M4/gcc_version.m4
rename to jni/libsndfile/sources/M4/gcc_version.m4
diff --git a/jni/libsndfile/M4/libtool.m4 b/jni/libsndfile/sources/M4/libtool.m4
similarity index 100%
rename from jni/libsndfile/M4/libtool.m4
rename to jni/libsndfile/sources/M4/libtool.m4
diff --git a/jni/libsndfile/M4/llrint.m4 b/jni/libsndfile/sources/M4/llrint.m4
similarity index 100%
rename from jni/libsndfile/M4/llrint.m4
rename to jni/libsndfile/sources/M4/llrint.m4
diff --git a/jni/libsndfile/M4/lrint.m4 b/jni/libsndfile/sources/M4/lrint.m4
similarity index 100%
rename from jni/libsndfile/M4/lrint.m4
rename to jni/libsndfile/sources/M4/lrint.m4
diff --git a/jni/libsndfile/M4/lrintf.m4 b/jni/libsndfile/sources/M4/lrintf.m4
similarity index 100%
rename from jni/libsndfile/M4/lrintf.m4
rename to jni/libsndfile/sources/M4/lrintf.m4
diff --git a/jni/libsndfile/M4/ltoptions.m4 b/jni/libsndfile/sources/M4/ltoptions.m4
similarity index 100%
rename from jni/libsndfile/M4/ltoptions.m4
rename to jni/libsndfile/sources/M4/ltoptions.m4
diff --git a/jni/libsndfile/M4/ltsugar.m4 b/jni/libsndfile/sources/M4/ltsugar.m4
similarity index 100%
rename from jni/libsndfile/M4/ltsugar.m4
rename to jni/libsndfile/sources/M4/ltsugar.m4
diff --git a/jni/libsndfile/M4/ltversion.m4 b/jni/libsndfile/sources/M4/ltversion.m4
similarity index 100%
rename from jni/libsndfile/M4/ltversion.m4
rename to jni/libsndfile/sources/M4/ltversion.m4
diff --git a/jni/libsndfile/M4/lt~obsolete.m4 b/jni/libsndfile/sources/M4/lt~obsolete.m4
similarity index 100%
rename from jni/libsndfile/M4/lt~obsolete.m4
rename to jni/libsndfile/sources/M4/lt~obsolete.m4
diff --git a/jni/libsndfile/M4/mkoctfile_version.m4 b/jni/libsndfile/sources/M4/mkoctfile_version.m4
similarity index 100%
rename from jni/libsndfile/M4/mkoctfile_version.m4
rename to jni/libsndfile/sources/M4/mkoctfile_version.m4
diff --git a/jni/libsndfile/M4/octave.m4 b/jni/libsndfile/sources/M4/octave.m4
similarity index 100%
rename from jni/libsndfile/M4/octave.m4
rename to jni/libsndfile/sources/M4/octave.m4
diff --git a/jni/libsndfile/Makefile b/jni/libsndfile/sources/Makefile
similarity index 100%
rename from jni/libsndfile/Makefile
rename to jni/libsndfile/sources/Makefile
diff --git a/jni/libsndfile/Makefile.am b/jni/libsndfile/sources/Makefile.am
similarity index 100%
rename from jni/libsndfile/Makefile.am
rename to jni/libsndfile/sources/Makefile.am
diff --git a/jni/libsndfile/Makefile.in b/jni/libsndfile/sources/Makefile.in
similarity index 100%
rename from jni/libsndfile/Makefile.in
rename to jni/libsndfile/sources/Makefile.in
diff --git a/jni/libsndfile/NEWS b/jni/libsndfile/sources/NEWS
similarity index 100%
rename from jni/libsndfile/NEWS
rename to jni/libsndfile/sources/NEWS
diff --git a/jni/libsndfile/Octave/Makefile b/jni/libsndfile/sources/Octave/Makefile
similarity index 100%
rename from jni/libsndfile/Octave/Makefile
rename to jni/libsndfile/sources/Octave/Makefile
diff --git a/jni/libsndfile/Octave/Makefile.am b/jni/libsndfile/sources/Octave/Makefile.am
similarity index 100%
rename from jni/libsndfile/Octave/Makefile.am
rename to jni/libsndfile/sources/Octave/Makefile.am
diff --git a/jni/libsndfile/Octave/Makefile.in b/jni/libsndfile/sources/Octave/Makefile.in
similarity index 100%
rename from jni/libsndfile/Octave/Makefile.in
rename to jni/libsndfile/sources/Octave/Makefile.in
diff --git a/jni/libsndfile/Octave/PKG_ADD b/jni/libsndfile/sources/Octave/PKG_ADD
similarity index 100%
rename from jni/libsndfile/Octave/PKG_ADD
rename to jni/libsndfile/sources/Octave/PKG_ADD
diff --git a/jni/libsndfile/Octave/octave_test.m b/jni/libsndfile/sources/Octave/octave_test.m
similarity index 100%
rename from jni/libsndfile/Octave/octave_test.m
rename to jni/libsndfile/sources/Octave/octave_test.m
diff --git a/jni/libsndfile/Octave/octave_test.sh b/jni/libsndfile/sources/Octave/octave_test.sh
similarity index 100%
rename from jni/libsndfile/Octave/octave_test.sh
rename to jni/libsndfile/sources/Octave/octave_test.sh
diff --git a/jni/libsndfile/Octave/sndfile.cc b/jni/libsndfile/sources/Octave/sndfile.cc
similarity index 100%
rename from jni/libsndfile/Octave/sndfile.cc
rename to jni/libsndfile/sources/Octave/sndfile.cc
diff --git a/jni/libsndfile/Octave/sndfile_load.m b/jni/libsndfile/sources/Octave/sndfile_load.m
similarity index 100%
rename from jni/libsndfile/Octave/sndfile_load.m
rename to jni/libsndfile/sources/Octave/sndfile_load.m
diff --git a/jni/libsndfile/Octave/sndfile_play.m b/jni/libsndfile/sources/Octave/sndfile_play.m
similarity index 100%
rename from jni/libsndfile/Octave/sndfile_play.m
rename to jni/libsndfile/sources/Octave/sndfile_play.m
diff --git a/jni/libsndfile/Octave/sndfile_save.m b/jni/libsndfile/sources/Octave/sndfile_save.m
similarity index 100%
rename from jni/libsndfile/Octave/sndfile_save.m
rename to jni/libsndfile/sources/Octave/sndfile_save.m
diff --git a/jni/libsndfile/README b/jni/libsndfile/sources/README
similarity index 100%
rename from jni/libsndfile/README
rename to jni/libsndfile/sources/README
diff --git a/jni/libsndfile/Win32/Makefile b/jni/libsndfile/sources/Win32/Makefile
similarity index 100%
rename from jni/libsndfile/Win32/Makefile
rename to jni/libsndfile/sources/Win32/Makefile
diff --git a/jni/libsndfile/Win32/Makefile.am b/jni/libsndfile/sources/Win32/Makefile.am
similarity index 100%
rename from jni/libsndfile/Win32/Makefile.am
rename to jni/libsndfile/sources/Win32/Makefile.am
diff --git a/jni/libsndfile/Win32/Makefile.in b/jni/libsndfile/sources/Win32/Makefile.in
similarity index 100%
rename from jni/libsndfile/Win32/Makefile.in
rename to jni/libsndfile/sources/Win32/Makefile.in
diff --git a/jni/libsndfile/Win32/README-precompiled-dll.txt b/jni/libsndfile/sources/Win32/README-precompiled-dll.txt
similarity index 100%
rename from jni/libsndfile/Win32/README-precompiled-dll.txt
rename to jni/libsndfile/sources/Win32/README-precompiled-dll.txt
diff --git a/jni/libsndfile/Win32/testprog.c b/jni/libsndfile/sources/Win32/testprog.c
similarity index 100%
rename from jni/libsndfile/Win32/testprog.c
rename to jni/libsndfile/sources/Win32/testprog.c
diff --git a/jni/libsndfile/aclocal.m4 b/jni/libsndfile/sources/aclocal.m4
similarity index 100%
rename from jni/libsndfile/aclocal.m4
rename to jni/libsndfile/sources/aclocal.m4
diff --git a/jni/libsndfile/build-test-tarball.mk b/jni/libsndfile/sources/build-test-tarball.mk
similarity index 100%
rename from jni/libsndfile/build-test-tarball.mk
rename to jni/libsndfile/sources/build-test-tarball.mk
diff --git a/jni/libsndfile/build-test-tarball.mk.in b/jni/libsndfile/sources/build-test-tarball.mk.in
similarity index 100%
rename from jni/libsndfile/build-test-tarball.mk.in
rename to jni/libsndfile/sources/build-test-tarball.mk.in
diff --git a/jni/libsndfile/config.log b/jni/libsndfile/sources/config.log
similarity index 100%
rename from jni/libsndfile/config.log
rename to jni/libsndfile/sources/config.log
diff --git a/jni/libsndfile/config.status b/jni/libsndfile/sources/config.status
similarity index 100%
rename from jni/libsndfile/config.status
rename to jni/libsndfile/sources/config.status
diff --git a/jni/libsndfile/configure b/jni/libsndfile/sources/configure
similarity index 100%
rename from jni/libsndfile/configure
rename to jni/libsndfile/sources/configure
diff --git a/jni/libsndfile/configure.ac b/jni/libsndfile/sources/configure.ac
similarity index 100%
rename from jni/libsndfile/configure.ac
rename to jni/libsndfile/sources/configure.ac
diff --git a/jni/libsndfile/doc/AUTHORS b/jni/libsndfile/sources/doc/AUTHORS
similarity index 100%
rename from jni/libsndfile/doc/AUTHORS
rename to jni/libsndfile/sources/doc/AUTHORS
diff --git a/jni/libsndfile/doc/ChangeLog b/jni/libsndfile/sources/doc/ChangeLog
similarity index 100%
rename from jni/libsndfile/doc/ChangeLog
rename to jni/libsndfile/sources/doc/ChangeLog
diff --git a/jni/libsndfile/doc/FAQ.html b/jni/libsndfile/sources/doc/FAQ.html
similarity index 100%
rename from jni/libsndfile/doc/FAQ.html
rename to jni/libsndfile/sources/doc/FAQ.html
diff --git a/jni/libsndfile/doc/Makefile b/jni/libsndfile/sources/doc/Makefile
similarity index 100%
rename from jni/libsndfile/doc/Makefile
rename to jni/libsndfile/sources/doc/Makefile
diff --git a/jni/libsndfile/doc/Makefile.am b/jni/libsndfile/sources/doc/Makefile.am
similarity index 100%
rename from jni/libsndfile/doc/Makefile.am
rename to jni/libsndfile/sources/doc/Makefile.am
diff --git a/jni/libsndfile/doc/Makefile.in b/jni/libsndfile/sources/doc/Makefile.in
similarity index 100%
rename from jni/libsndfile/doc/Makefile.in
rename to jni/libsndfile/sources/doc/Makefile.in
diff --git a/jni/libsndfile/doc/NEWS b/jni/libsndfile/sources/doc/NEWS
similarity index 100%
rename from jni/libsndfile/doc/NEWS
rename to jni/libsndfile/sources/doc/NEWS
diff --git a/jni/libsndfile/doc/README b/jni/libsndfile/sources/doc/README
similarity index 100%
rename from jni/libsndfile/doc/README
rename to jni/libsndfile/sources/doc/README
diff --git a/jni/libsndfile/doc/api.html b/jni/libsndfile/sources/doc/api.html
similarity index 100%
rename from jni/libsndfile/doc/api.html
rename to jni/libsndfile/sources/doc/api.html
diff --git a/jni/libsndfile/doc/bugs.html b/jni/libsndfile/sources/doc/bugs.html
similarity index 100%
rename from jni/libsndfile/doc/bugs.html
rename to jni/libsndfile/sources/doc/bugs.html
diff --git a/jni/libsndfile/doc/command.html b/jni/libsndfile/sources/doc/command.html
similarity index 100%
rename from jni/libsndfile/doc/command.html
rename to jni/libsndfile/sources/doc/command.html
diff --git a/jni/libsndfile/doc/dither.html b/jni/libsndfile/sources/doc/dither.html
similarity index 100%
rename from jni/libsndfile/doc/dither.html
rename to jni/libsndfile/sources/doc/dither.html
diff --git a/jni/libsndfile/doc/embedded_files.html b/jni/libsndfile/sources/doc/embedded_files.html
similarity index 100%
rename from jni/libsndfile/doc/embedded_files.html
rename to jni/libsndfile/sources/doc/embedded_files.html
diff --git a/jni/libsndfile/doc/index.html b/jni/libsndfile/sources/doc/index.html
similarity index 100%
rename from jni/libsndfile/doc/index.html
rename to jni/libsndfile/sources/doc/index.html
diff --git a/jni/libsndfile/doc/libsndfile.css b/jni/libsndfile/sources/doc/libsndfile.css
similarity index 100%
rename from jni/libsndfile/doc/libsndfile.css
rename to jni/libsndfile/sources/doc/libsndfile.css
diff --git a/jni/libsndfile/doc/libsndfile.css.in b/jni/libsndfile/sources/doc/libsndfile.css.in
similarity index 100%
rename from jni/libsndfile/doc/libsndfile.css.in
rename to jni/libsndfile/sources/doc/libsndfile.css.in
diff --git a/jni/libsndfile/doc/libsndfile.jpg b/jni/libsndfile/sources/doc/libsndfile.jpg
similarity index 100%
rename from jni/libsndfile/doc/libsndfile.jpg
rename to jni/libsndfile/sources/doc/libsndfile.jpg
Binary files differ
diff --git a/jni/libsndfile/doc/lists.html b/jni/libsndfile/sources/doc/lists.html
similarity index 100%
rename from jni/libsndfile/doc/lists.html
rename to jni/libsndfile/sources/doc/lists.html
diff --git a/jni/libsndfile/doc/new_file_type.HOWTO b/jni/libsndfile/sources/doc/new_file_type.HOWTO
similarity index 100%
rename from jni/libsndfile/doc/new_file_type.HOWTO
rename to jni/libsndfile/sources/doc/new_file_type.HOWTO
diff --git a/jni/libsndfile/doc/octave.html b/jni/libsndfile/sources/doc/octave.html
similarity index 100%
rename from jni/libsndfile/doc/octave.html
rename to jni/libsndfile/sources/doc/octave.html
diff --git a/jni/libsndfile/doc/pkgconfig.html b/jni/libsndfile/sources/doc/pkgconfig.html
similarity index 100%
rename from jni/libsndfile/doc/pkgconfig.html
rename to jni/libsndfile/sources/doc/pkgconfig.html
diff --git a/jni/libsndfile/doc/sndfile_info.html b/jni/libsndfile/sources/doc/sndfile_info.html
similarity index 100%
rename from jni/libsndfile/doc/sndfile_info.html
rename to jni/libsndfile/sources/doc/sndfile_info.html
diff --git a/jni/libsndfile/doc/tutorial.html b/jni/libsndfile/sources/doc/tutorial.html
similarity index 100%
rename from jni/libsndfile/doc/tutorial.html
rename to jni/libsndfile/sources/doc/tutorial.html
diff --git a/jni/libsndfile/doc/win32.html b/jni/libsndfile/sources/doc/win32.html
similarity index 100%
rename from jni/libsndfile/doc/win32.html
rename to jni/libsndfile/sources/doc/win32.html
diff --git a/jni/libsndfile/examples/.deps/generate.Po b/jni/libsndfile/sources/examples/.deps/generate.Po
similarity index 100%
rename from jni/libsndfile/examples/.deps/generate.Po
rename to jni/libsndfile/sources/examples/.deps/generate.Po
diff --git a/jni/libsndfile/examples/.deps/list_formats.Po b/jni/libsndfile/sources/examples/.deps/list_formats.Po
similarity index 100%
rename from jni/libsndfile/examples/.deps/list_formats.Po
rename to jni/libsndfile/sources/examples/.deps/list_formats.Po
diff --git a/jni/libsndfile/examples/.deps/make_sine.Po b/jni/libsndfile/sources/examples/.deps/make_sine.Po
similarity index 100%
rename from jni/libsndfile/examples/.deps/make_sine.Po
rename to jni/libsndfile/sources/examples/.deps/make_sine.Po
diff --git a/jni/libsndfile/examples/.deps/sfprocess.Po b/jni/libsndfile/sources/examples/.deps/sfprocess.Po
similarity index 100%
rename from jni/libsndfile/examples/.deps/sfprocess.Po
rename to jni/libsndfile/sources/examples/.deps/sfprocess.Po
diff --git a/jni/libsndfile/examples/.deps/sndfile-to-text.Po b/jni/libsndfile/sources/examples/.deps/sndfile-to-text.Po
similarity index 100%
rename from jni/libsndfile/examples/.deps/sndfile-to-text.Po
rename to jni/libsndfile/sources/examples/.deps/sndfile-to-text.Po
diff --git a/jni/libsndfile/examples/.deps/sndfilehandle.Po b/jni/libsndfile/sources/examples/.deps/sndfilehandle.Po
similarity index 100%
rename from jni/libsndfile/examples/.deps/sndfilehandle.Po
rename to jni/libsndfile/sources/examples/.deps/sndfilehandle.Po
diff --git a/jni/libsndfile/examples/.libs/generate b/jni/libsndfile/sources/examples/.libs/generate
similarity index 100%
rename from jni/libsndfile/examples/.libs/generate
rename to jni/libsndfile/sources/examples/.libs/generate
Binary files differ
diff --git a/jni/libsndfile/examples/.libs/list_formats b/jni/libsndfile/sources/examples/.libs/list_formats
similarity index 100%
rename from jni/libsndfile/examples/.libs/list_formats
rename to jni/libsndfile/sources/examples/.libs/list_formats
Binary files differ
diff --git a/jni/libsndfile/examples/.libs/make_sine b/jni/libsndfile/sources/examples/.libs/make_sine
similarity index 100%
rename from jni/libsndfile/examples/.libs/make_sine
rename to jni/libsndfile/sources/examples/.libs/make_sine
Binary files differ
diff --git a/jni/libsndfile/examples/.libs/sfprocess b/jni/libsndfile/sources/examples/.libs/sfprocess
similarity index 100%
rename from jni/libsndfile/examples/.libs/sfprocess
rename to jni/libsndfile/sources/examples/.libs/sfprocess
Binary files differ
diff --git a/jni/libsndfile/examples/.libs/sndfile-to-text b/jni/libsndfile/sources/examples/.libs/sndfile-to-text
similarity index 100%
rename from jni/libsndfile/examples/.libs/sndfile-to-text
rename to jni/libsndfile/sources/examples/.libs/sndfile-to-text
Binary files differ
diff --git a/jni/libsndfile/examples/.libs/sndfilehandle b/jni/libsndfile/sources/examples/.libs/sndfilehandle
similarity index 100%
rename from jni/libsndfile/examples/.libs/sndfilehandle
rename to jni/libsndfile/sources/examples/.libs/sndfilehandle
Binary files differ
diff --git a/jni/libsndfile/examples/Makefile b/jni/libsndfile/sources/examples/Makefile
similarity index 100%
rename from jni/libsndfile/examples/Makefile
rename to jni/libsndfile/sources/examples/Makefile
diff --git a/jni/libsndfile/examples/Makefile.am b/jni/libsndfile/sources/examples/Makefile.am
similarity index 100%
rename from jni/libsndfile/examples/Makefile.am
rename to jni/libsndfile/sources/examples/Makefile.am
diff --git a/jni/libsndfile/examples/Makefile.in b/jni/libsndfile/sources/examples/Makefile.in
similarity index 100%
rename from jni/libsndfile/examples/Makefile.in
rename to jni/libsndfile/sources/examples/Makefile.in
diff --git a/jni/libsndfile/examples/generate b/jni/libsndfile/sources/examples/generate
similarity index 100%
rename from jni/libsndfile/examples/generate
rename to jni/libsndfile/sources/examples/generate
diff --git a/jni/libsndfile/examples/generate.c b/jni/libsndfile/sources/examples/generate.c
similarity index 100%
rename from jni/libsndfile/examples/generate.c
rename to jni/libsndfile/sources/examples/generate.c
diff --git a/jni/libsndfile/examples/list_formats b/jni/libsndfile/sources/examples/list_formats
similarity index 100%
rename from jni/libsndfile/examples/list_formats
rename to jni/libsndfile/sources/examples/list_formats
diff --git a/jni/libsndfile/examples/list_formats.c b/jni/libsndfile/sources/examples/list_formats.c
similarity index 100%
rename from jni/libsndfile/examples/list_formats.c
rename to jni/libsndfile/sources/examples/list_formats.c
diff --git a/jni/libsndfile/examples/make_sine b/jni/libsndfile/sources/examples/make_sine
similarity index 100%
rename from jni/libsndfile/examples/make_sine
rename to jni/libsndfile/sources/examples/make_sine
diff --git a/jni/libsndfile/examples/make_sine.c b/jni/libsndfile/sources/examples/make_sine.c
similarity index 100%
rename from jni/libsndfile/examples/make_sine.c
rename to jni/libsndfile/sources/examples/make_sine.c
diff --git a/jni/libsndfile/examples/sfprocess b/jni/libsndfile/sources/examples/sfprocess
similarity index 100%
rename from jni/libsndfile/examples/sfprocess
rename to jni/libsndfile/sources/examples/sfprocess
diff --git a/jni/libsndfile/examples/sfprocess.c b/jni/libsndfile/sources/examples/sfprocess.c
similarity index 100%
rename from jni/libsndfile/examples/sfprocess.c
rename to jni/libsndfile/sources/examples/sfprocess.c
diff --git a/jni/libsndfile/examples/sndfile-to-text b/jni/libsndfile/sources/examples/sndfile-to-text
similarity index 100%
rename from jni/libsndfile/examples/sndfile-to-text
rename to jni/libsndfile/sources/examples/sndfile-to-text
diff --git a/jni/libsndfile/examples/sndfile-to-text.c b/jni/libsndfile/sources/examples/sndfile-to-text.c
similarity index 100%
rename from jni/libsndfile/examples/sndfile-to-text.c
rename to jni/libsndfile/sources/examples/sndfile-to-text.c
diff --git a/jni/libsndfile/examples/sndfilehandle b/jni/libsndfile/sources/examples/sndfilehandle
similarity index 100%
rename from jni/libsndfile/examples/sndfilehandle
rename to jni/libsndfile/sources/examples/sndfilehandle
diff --git a/jni/libsndfile/examples/sndfilehandle.cc b/jni/libsndfile/sources/examples/sndfilehandle.cc
similarity index 100%
rename from jni/libsndfile/examples/sndfilehandle.cc
rename to jni/libsndfile/sources/examples/sndfilehandle.cc
diff --git a/jni/libsndfile/libsndfile.spec b/jni/libsndfile/sources/libsndfile.spec
similarity index 100%
rename from jni/libsndfile/libsndfile.spec
rename to jni/libsndfile/sources/libsndfile.spec
diff --git a/jni/libsndfile/libsndfile.spec.in b/jni/libsndfile/sources/libsndfile.spec.in
similarity index 100%
rename from jni/libsndfile/libsndfile.spec.in
rename to jni/libsndfile/sources/libsndfile.spec.in
diff --git a/jni/libsndfile/libtool b/jni/libsndfile/sources/libtool
similarity index 100%
rename from jni/libsndfile/libtool
rename to jni/libsndfile/sources/libtool
diff --git a/jni/libsndfile/man/Makefile b/jni/libsndfile/sources/man/Makefile
similarity index 100%
rename from jni/libsndfile/man/Makefile
rename to jni/libsndfile/sources/man/Makefile
diff --git a/jni/libsndfile/man/Makefile.am b/jni/libsndfile/sources/man/Makefile.am
similarity index 100%
rename from jni/libsndfile/man/Makefile.am
rename to jni/libsndfile/sources/man/Makefile.am
diff --git a/jni/libsndfile/man/Makefile.in b/jni/libsndfile/sources/man/Makefile.in
similarity index 100%
rename from jni/libsndfile/man/Makefile.in
rename to jni/libsndfile/sources/man/Makefile.in
diff --git a/jni/libsndfile/man/sndfile-cmp.1 b/jni/libsndfile/sources/man/sndfile-cmp.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-cmp.1
rename to jni/libsndfile/sources/man/sndfile-cmp.1
diff --git a/jni/libsndfile/man/sndfile-concat.1 b/jni/libsndfile/sources/man/sndfile-concat.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-concat.1
rename to jni/libsndfile/sources/man/sndfile-concat.1
diff --git a/jni/libsndfile/man/sndfile-convert.1 b/jni/libsndfile/sources/man/sndfile-convert.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-convert.1
rename to jni/libsndfile/sources/man/sndfile-convert.1
diff --git a/jni/libsndfile/man/sndfile-deinterleave.1 b/jni/libsndfile/sources/man/sndfile-deinterleave.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-deinterleave.1
rename to jni/libsndfile/sources/man/sndfile-deinterleave.1
diff --git a/jni/libsndfile/man/sndfile-info.1 b/jni/libsndfile/sources/man/sndfile-info.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-info.1
rename to jni/libsndfile/sources/man/sndfile-info.1
diff --git a/jni/libsndfile/man/sndfile-interleave.1 b/jni/libsndfile/sources/man/sndfile-interleave.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-interleave.1
rename to jni/libsndfile/sources/man/sndfile-interleave.1
diff --git a/jni/libsndfile/man/sndfile-metadata-get.1 b/jni/libsndfile/sources/man/sndfile-metadata-get.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-metadata-get.1
rename to jni/libsndfile/sources/man/sndfile-metadata-get.1
diff --git a/jni/libsndfile/man/sndfile-metadata-set.1 b/jni/libsndfile/sources/man/sndfile-metadata-set.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-metadata-set.1
rename to jni/libsndfile/sources/man/sndfile-metadata-set.1
diff --git a/jni/libsndfile/man/sndfile-play.1 b/jni/libsndfile/sources/man/sndfile-play.1
similarity index 100%
rename from jni/libsndfile/man/sndfile-play.1
rename to jni/libsndfile/sources/man/sndfile-play.1
diff --git a/jni/libsndfile/programs/.deps/common.Po b/jni/libsndfile/sources/programs/.deps/common.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/common.Po
rename to jni/libsndfile/sources/programs/.deps/common.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-cmp.Po b/jni/libsndfile/sources/programs/.deps/sndfile-cmp.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-cmp.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-cmp.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-concat.Po b/jni/libsndfile/sources/programs/.deps/sndfile-concat.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-concat.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-concat.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-convert.Po b/jni/libsndfile/sources/programs/.deps/sndfile-convert.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-convert.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-convert.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-deinterleave.Po b/jni/libsndfile/sources/programs/.deps/sndfile-deinterleave.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-deinterleave.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-deinterleave.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-info.Po b/jni/libsndfile/sources/programs/.deps/sndfile-info.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-info.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-info.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-interleave.Po b/jni/libsndfile/sources/programs/.deps/sndfile-interleave.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-interleave.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-interleave.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-metadata-get.Po b/jni/libsndfile/sources/programs/.deps/sndfile-metadata-get.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-metadata-get.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-metadata-get.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-metadata-set.Po b/jni/libsndfile/sources/programs/.deps/sndfile-metadata-set.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-metadata-set.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-metadata-set.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-play.Po b/jni/libsndfile/sources/programs/.deps/sndfile-play.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-play.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-play.Po
diff --git a/jni/libsndfile/programs/.deps/sndfile-salvage.Po b/jni/libsndfile/sources/programs/.deps/sndfile-salvage.Po
similarity index 100%
rename from jni/libsndfile/programs/.deps/sndfile-salvage.Po
rename to jni/libsndfile/sources/programs/.deps/sndfile-salvage.Po
diff --git a/jni/libsndfile/programs/.libs/sndfile-cmp b/jni/libsndfile/sources/programs/.libs/sndfile-cmp
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-cmp
rename to jni/libsndfile/sources/programs/.libs/sndfile-cmp
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-concat b/jni/libsndfile/sources/programs/.libs/sndfile-concat
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-concat
rename to jni/libsndfile/sources/programs/.libs/sndfile-concat
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-convert b/jni/libsndfile/sources/programs/.libs/sndfile-convert
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-convert
rename to jni/libsndfile/sources/programs/.libs/sndfile-convert
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-deinterleave b/jni/libsndfile/sources/programs/.libs/sndfile-deinterleave
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-deinterleave
rename to jni/libsndfile/sources/programs/.libs/sndfile-deinterleave
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-info b/jni/libsndfile/sources/programs/.libs/sndfile-info
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-info
rename to jni/libsndfile/sources/programs/.libs/sndfile-info
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-interleave b/jni/libsndfile/sources/programs/.libs/sndfile-interleave
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-interleave
rename to jni/libsndfile/sources/programs/.libs/sndfile-interleave
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-metadata-get b/jni/libsndfile/sources/programs/.libs/sndfile-metadata-get
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-metadata-get
rename to jni/libsndfile/sources/programs/.libs/sndfile-metadata-get
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-metadata-set b/jni/libsndfile/sources/programs/.libs/sndfile-metadata-set
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-metadata-set
rename to jni/libsndfile/sources/programs/.libs/sndfile-metadata-set
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-play b/jni/libsndfile/sources/programs/.libs/sndfile-play
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-play
rename to jni/libsndfile/sources/programs/.libs/sndfile-play
Binary files differ
diff --git a/jni/libsndfile/programs/.libs/sndfile-salvage b/jni/libsndfile/sources/programs/.libs/sndfile-salvage
similarity index 100%
rename from jni/libsndfile/programs/.libs/sndfile-salvage
rename to jni/libsndfile/sources/programs/.libs/sndfile-salvage
Binary files differ
diff --git a/jni/libsndfile/programs/Makefile b/jni/libsndfile/sources/programs/Makefile
similarity index 100%
rename from jni/libsndfile/programs/Makefile
rename to jni/libsndfile/sources/programs/Makefile
diff --git a/jni/libsndfile/programs/Makefile.am b/jni/libsndfile/sources/programs/Makefile.am
similarity index 100%
rename from jni/libsndfile/programs/Makefile.am
rename to jni/libsndfile/sources/programs/Makefile.am
diff --git a/jni/libsndfile/programs/Makefile.in b/jni/libsndfile/sources/programs/Makefile.in
similarity index 100%
rename from jni/libsndfile/programs/Makefile.in
rename to jni/libsndfile/sources/programs/Makefile.in
diff --git a/jni/libsndfile/programs/common.c b/jni/libsndfile/sources/programs/common.c
similarity index 100%
rename from jni/libsndfile/programs/common.c
rename to jni/libsndfile/sources/programs/common.c
diff --git a/jni/libsndfile/programs/common.h b/jni/libsndfile/sources/programs/common.h
similarity index 100%
rename from jni/libsndfile/programs/common.h
rename to jni/libsndfile/sources/programs/common.h
diff --git a/jni/libsndfile/programs/sndfile-cmp b/jni/libsndfile/sources/programs/sndfile-cmp
similarity index 100%
rename from jni/libsndfile/programs/sndfile-cmp
rename to jni/libsndfile/sources/programs/sndfile-cmp
diff --git a/jni/libsndfile/programs/sndfile-cmp.c b/jni/libsndfile/sources/programs/sndfile-cmp.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-cmp.c
rename to jni/libsndfile/sources/programs/sndfile-cmp.c
diff --git a/jni/libsndfile/programs/sndfile-concat b/jni/libsndfile/sources/programs/sndfile-concat
similarity index 100%
rename from jni/libsndfile/programs/sndfile-concat
rename to jni/libsndfile/sources/programs/sndfile-concat
diff --git a/jni/libsndfile/programs/sndfile-concat.c b/jni/libsndfile/sources/programs/sndfile-concat.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-concat.c
rename to jni/libsndfile/sources/programs/sndfile-concat.c
diff --git a/jni/libsndfile/programs/sndfile-convert b/jni/libsndfile/sources/programs/sndfile-convert
similarity index 100%
rename from jni/libsndfile/programs/sndfile-convert
rename to jni/libsndfile/sources/programs/sndfile-convert
diff --git a/jni/libsndfile/programs/sndfile-convert.c b/jni/libsndfile/sources/programs/sndfile-convert.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-convert.c
rename to jni/libsndfile/sources/programs/sndfile-convert.c
diff --git a/jni/libsndfile/programs/sndfile-deinterleave b/jni/libsndfile/sources/programs/sndfile-deinterleave
similarity index 100%
rename from jni/libsndfile/programs/sndfile-deinterleave
rename to jni/libsndfile/sources/programs/sndfile-deinterleave
diff --git a/jni/libsndfile/programs/sndfile-deinterleave.c b/jni/libsndfile/sources/programs/sndfile-deinterleave.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-deinterleave.c
rename to jni/libsndfile/sources/programs/sndfile-deinterleave.c
diff --git a/jni/libsndfile/programs/sndfile-info b/jni/libsndfile/sources/programs/sndfile-info
similarity index 100%
rename from jni/libsndfile/programs/sndfile-info
rename to jni/libsndfile/sources/programs/sndfile-info
diff --git a/jni/libsndfile/programs/sndfile-info.c b/jni/libsndfile/sources/programs/sndfile-info.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-info.c
rename to jni/libsndfile/sources/programs/sndfile-info.c
diff --git a/jni/libsndfile/programs/sndfile-interleave b/jni/libsndfile/sources/programs/sndfile-interleave
similarity index 100%
rename from jni/libsndfile/programs/sndfile-interleave
rename to jni/libsndfile/sources/programs/sndfile-interleave
diff --git a/jni/libsndfile/programs/sndfile-interleave.c b/jni/libsndfile/sources/programs/sndfile-interleave.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-interleave.c
rename to jni/libsndfile/sources/programs/sndfile-interleave.c
diff --git a/jni/libsndfile/programs/sndfile-metadata-get b/jni/libsndfile/sources/programs/sndfile-metadata-get
similarity index 100%
rename from jni/libsndfile/programs/sndfile-metadata-get
rename to jni/libsndfile/sources/programs/sndfile-metadata-get
diff --git a/jni/libsndfile/programs/sndfile-metadata-get.c b/jni/libsndfile/sources/programs/sndfile-metadata-get.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-metadata-get.c
rename to jni/libsndfile/sources/programs/sndfile-metadata-get.c
diff --git a/jni/libsndfile/programs/sndfile-metadata-set b/jni/libsndfile/sources/programs/sndfile-metadata-set
similarity index 100%
rename from jni/libsndfile/programs/sndfile-metadata-set
rename to jni/libsndfile/sources/programs/sndfile-metadata-set
diff --git a/jni/libsndfile/programs/sndfile-metadata-set.c b/jni/libsndfile/sources/programs/sndfile-metadata-set.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-metadata-set.c
rename to jni/libsndfile/sources/programs/sndfile-metadata-set.c
diff --git a/jni/libsndfile/programs/sndfile-play b/jni/libsndfile/sources/programs/sndfile-play
similarity index 100%
rename from jni/libsndfile/programs/sndfile-play
rename to jni/libsndfile/sources/programs/sndfile-play
diff --git a/jni/libsndfile/programs/sndfile-play-beos.cpp b/jni/libsndfile/sources/programs/sndfile-play-beos.cpp
similarity index 100%
rename from jni/libsndfile/programs/sndfile-play-beos.cpp
rename to jni/libsndfile/sources/programs/sndfile-play-beos.cpp
diff --git a/jni/libsndfile/programs/sndfile-play.c b/jni/libsndfile/sources/programs/sndfile-play.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-play.c
rename to jni/libsndfile/sources/programs/sndfile-play.c
diff --git a/jni/libsndfile/programs/sndfile-salvage b/jni/libsndfile/sources/programs/sndfile-salvage
similarity index 100%
rename from jni/libsndfile/programs/sndfile-salvage
rename to jni/libsndfile/sources/programs/sndfile-salvage
diff --git a/jni/libsndfile/programs/sndfile-salvage.c b/jni/libsndfile/sources/programs/sndfile-salvage.c
similarity index 100%
rename from jni/libsndfile/programs/sndfile-salvage.c
rename to jni/libsndfile/sources/programs/sndfile-salvage.c
diff --git a/jni/libsndfile/programs/test-sndfile-metadata-set.py b/jni/libsndfile/sources/programs/test-sndfile-metadata-set.py
similarity index 100%
rename from jni/libsndfile/programs/test-sndfile-metadata-set.py
rename to jni/libsndfile/sources/programs/test-sndfile-metadata-set.py
diff --git a/jni/libsndfile/regtest/.deps/checksum.Po b/jni/libsndfile/sources/regtest/.deps/checksum.Po
similarity index 100%
rename from jni/libsndfile/regtest/.deps/checksum.Po
rename to jni/libsndfile/sources/regtest/.deps/checksum.Po
diff --git a/jni/libsndfile/regtest/.deps/database.Po b/jni/libsndfile/sources/regtest/.deps/database.Po
similarity index 100%
rename from jni/libsndfile/regtest/.deps/database.Po
rename to jni/libsndfile/sources/regtest/.deps/database.Po
diff --git a/jni/libsndfile/regtest/.deps/sndfile-regtest.Po b/jni/libsndfile/sources/regtest/.deps/sndfile-regtest.Po
similarity index 100%
rename from jni/libsndfile/regtest/.deps/sndfile-regtest.Po
rename to jni/libsndfile/sources/regtest/.deps/sndfile-regtest.Po
diff --git a/jni/libsndfile/regtest/.libs/sndfile-regtest b/jni/libsndfile/sources/regtest/.libs/sndfile-regtest
similarity index 100%
rename from jni/libsndfile/regtest/.libs/sndfile-regtest
rename to jni/libsndfile/sources/regtest/.libs/sndfile-regtest
Binary files differ
diff --git a/jni/libsndfile/regtest/Makefile b/jni/libsndfile/sources/regtest/Makefile
similarity index 100%
rename from jni/libsndfile/regtest/Makefile
rename to jni/libsndfile/sources/regtest/Makefile
diff --git a/jni/libsndfile/regtest/Makefile.am b/jni/libsndfile/sources/regtest/Makefile.am
similarity index 100%
rename from jni/libsndfile/regtest/Makefile.am
rename to jni/libsndfile/sources/regtest/Makefile.am
diff --git a/jni/libsndfile/regtest/Makefile.in b/jni/libsndfile/sources/regtest/Makefile.in
similarity index 100%
rename from jni/libsndfile/regtest/Makefile.in
rename to jni/libsndfile/sources/regtest/Makefile.in
diff --git a/jni/libsndfile/regtest/checksum.c b/jni/libsndfile/sources/regtest/checksum.c
similarity index 100%
rename from jni/libsndfile/regtest/checksum.c
rename to jni/libsndfile/sources/regtest/checksum.c
diff --git a/jni/libsndfile/regtest/database.c b/jni/libsndfile/sources/regtest/database.c
similarity index 100%
rename from jni/libsndfile/regtest/database.c
rename to jni/libsndfile/sources/regtest/database.c
diff --git a/jni/libsndfile/regtest/regtest.h b/jni/libsndfile/sources/regtest/regtest.h
similarity index 100%
rename from jni/libsndfile/regtest/regtest.h
rename to jni/libsndfile/sources/regtest/regtest.h
diff --git a/jni/libsndfile/regtest/sndfile-regtest b/jni/libsndfile/sources/regtest/sndfile-regtest
similarity index 100%
rename from jni/libsndfile/regtest/sndfile-regtest
rename to jni/libsndfile/sources/regtest/sndfile-regtest
diff --git a/jni/libsndfile/regtest/sndfile-regtest.c b/jni/libsndfile/sources/regtest/sndfile-regtest.c
similarity index 100%
rename from jni/libsndfile/regtest/sndfile-regtest.c
rename to jni/libsndfile/sources/regtest/sndfile-regtest.c
diff --git a/jni/libsndfile/sndfile.pc b/jni/libsndfile/sources/sndfile.pc
similarity index 100%
rename from jni/libsndfile/sndfile.pc
rename to jni/libsndfile/sources/sndfile.pc
diff --git a/jni/libsndfile/sndfile.pc.in b/jni/libsndfile/sources/sndfile.pc.in
similarity index 100%
rename from jni/libsndfile/sndfile.pc.in
rename to jni/libsndfile/sources/sndfile.pc.in
diff --git a/jni/libsndfile/src/.deps/aiff.Plo b/jni/libsndfile/sources/src/.deps/aiff.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/aiff.Plo
rename to jni/libsndfile/sources/src/.deps/aiff.Plo
diff --git a/jni/libsndfile/src/.deps/alaw.Plo b/jni/libsndfile/sources/src/.deps/alaw.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/alaw.Plo
rename to jni/libsndfile/sources/src/.deps/alaw.Plo
diff --git a/jni/libsndfile/src/.deps/au.Plo b/jni/libsndfile/sources/src/.deps/au.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/au.Plo
rename to jni/libsndfile/sources/src/.deps/au.Plo
diff --git a/jni/libsndfile/src/.deps/audio_detect.Plo b/jni/libsndfile/sources/src/.deps/audio_detect.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/audio_detect.Plo
rename to jni/libsndfile/sources/src/.deps/audio_detect.Plo
diff --git a/jni/libsndfile/src/.deps/avr.Plo b/jni/libsndfile/sources/src/.deps/avr.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/avr.Plo
rename to jni/libsndfile/sources/src/.deps/avr.Plo
diff --git a/jni/libsndfile/src/.deps/broadcast.Plo b/jni/libsndfile/sources/src/.deps/broadcast.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/broadcast.Plo
rename to jni/libsndfile/sources/src/.deps/broadcast.Plo
diff --git a/jni/libsndfile/src/.deps/caf.Plo b/jni/libsndfile/sources/src/.deps/caf.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/caf.Plo
rename to jni/libsndfile/sources/src/.deps/caf.Plo
diff --git a/jni/libsndfile/src/.deps/chanmap.Plo b/jni/libsndfile/sources/src/.deps/chanmap.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/chanmap.Plo
rename to jni/libsndfile/sources/src/.deps/chanmap.Plo
diff --git a/jni/libsndfile/src/.deps/chunk.Plo b/jni/libsndfile/sources/src/.deps/chunk.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/chunk.Plo
rename to jni/libsndfile/sources/src/.deps/chunk.Plo
diff --git a/jni/libsndfile/src/.deps/command.Plo b/jni/libsndfile/sources/src/.deps/command.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/command.Plo
rename to jni/libsndfile/sources/src/.deps/command.Plo
diff --git a/jni/libsndfile/src/.deps/common.Plo b/jni/libsndfile/sources/src/.deps/common.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/common.Plo
rename to jni/libsndfile/sources/src/.deps/common.Plo
diff --git a/jni/libsndfile/src/.deps/dither.Plo b/jni/libsndfile/sources/src/.deps/dither.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/dither.Plo
rename to jni/libsndfile/sources/src/.deps/dither.Plo
diff --git a/jni/libsndfile/src/.deps/double64.Plo b/jni/libsndfile/sources/src/.deps/double64.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/double64.Plo
rename to jni/libsndfile/sources/src/.deps/double64.Plo
diff --git a/jni/libsndfile/src/.deps/dwd.Plo b/jni/libsndfile/sources/src/.deps/dwd.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/dwd.Plo
rename to jni/libsndfile/sources/src/.deps/dwd.Plo
diff --git a/jni/libsndfile/src/.deps/dwvw.Plo b/jni/libsndfile/sources/src/.deps/dwvw.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/dwvw.Plo
rename to jni/libsndfile/sources/src/.deps/dwvw.Plo
diff --git a/jni/libsndfile/src/.deps/file_io.Plo b/jni/libsndfile/sources/src/.deps/file_io.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/file_io.Plo
rename to jni/libsndfile/sources/src/.deps/file_io.Plo
diff --git a/jni/libsndfile/src/.deps/flac.Plo b/jni/libsndfile/sources/src/.deps/flac.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/flac.Plo
rename to jni/libsndfile/sources/src/.deps/flac.Plo
diff --git a/jni/libsndfile/src/.deps/float32.Plo b/jni/libsndfile/sources/src/.deps/float32.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/float32.Plo
rename to jni/libsndfile/sources/src/.deps/float32.Plo
diff --git a/jni/libsndfile/src/.deps/g72x.Plo b/jni/libsndfile/sources/src/.deps/g72x.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/g72x.Plo
rename to jni/libsndfile/sources/src/.deps/g72x.Plo
diff --git a/jni/libsndfile/src/.deps/gsm610.Plo b/jni/libsndfile/sources/src/.deps/gsm610.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/gsm610.Plo
rename to jni/libsndfile/sources/src/.deps/gsm610.Plo
diff --git a/jni/libsndfile/src/.deps/htk.Plo b/jni/libsndfile/sources/src/.deps/htk.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/htk.Plo
rename to jni/libsndfile/sources/src/.deps/htk.Plo
diff --git a/jni/libsndfile/src/.deps/id3.Plo b/jni/libsndfile/sources/src/.deps/id3.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/id3.Plo
rename to jni/libsndfile/sources/src/.deps/id3.Plo
diff --git a/jni/libsndfile/src/.deps/ima_adpcm.Plo b/jni/libsndfile/sources/src/.deps/ima_adpcm.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ima_adpcm.Plo
rename to jni/libsndfile/sources/src/.deps/ima_adpcm.Plo
diff --git a/jni/libsndfile/src/.deps/ima_oki_adpcm.Plo b/jni/libsndfile/sources/src/.deps/ima_oki_adpcm.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ima_oki_adpcm.Plo
rename to jni/libsndfile/sources/src/.deps/ima_oki_adpcm.Plo
diff --git a/jni/libsndfile/src/.deps/interleave.Plo b/jni/libsndfile/sources/src/.deps/interleave.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/interleave.Plo
rename to jni/libsndfile/sources/src/.deps/interleave.Plo
diff --git a/jni/libsndfile/src/.deps/ircam.Plo b/jni/libsndfile/sources/src/.deps/ircam.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ircam.Plo
rename to jni/libsndfile/sources/src/.deps/ircam.Plo
diff --git a/jni/libsndfile/src/.deps/macbinary3.Plo b/jni/libsndfile/sources/src/.deps/macbinary3.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/macbinary3.Plo
rename to jni/libsndfile/sources/src/.deps/macbinary3.Plo
diff --git a/jni/libsndfile/src/.deps/macos.Plo b/jni/libsndfile/sources/src/.deps/macos.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/macos.Plo
rename to jni/libsndfile/sources/src/.deps/macos.Plo
diff --git a/jni/libsndfile/src/.deps/mat4.Plo b/jni/libsndfile/sources/src/.deps/mat4.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/mat4.Plo
rename to jni/libsndfile/sources/src/.deps/mat4.Plo
diff --git a/jni/libsndfile/src/.deps/mat5.Plo b/jni/libsndfile/sources/src/.deps/mat5.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/mat5.Plo
rename to jni/libsndfile/sources/src/.deps/mat5.Plo
diff --git a/jni/libsndfile/src/.deps/mpc2k.Plo b/jni/libsndfile/sources/src/.deps/mpc2k.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/mpc2k.Plo
rename to jni/libsndfile/sources/src/.deps/mpc2k.Plo
diff --git a/jni/libsndfile/src/.deps/ms_adpcm.Plo b/jni/libsndfile/sources/src/.deps/ms_adpcm.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ms_adpcm.Plo
rename to jni/libsndfile/sources/src/.deps/ms_adpcm.Plo
diff --git a/jni/libsndfile/src/.deps/nist.Plo b/jni/libsndfile/sources/src/.deps/nist.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/nist.Plo
rename to jni/libsndfile/sources/src/.deps/nist.Plo
diff --git a/jni/libsndfile/src/.deps/ogg.Plo b/jni/libsndfile/sources/src/.deps/ogg.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ogg.Plo
rename to jni/libsndfile/sources/src/.deps/ogg.Plo
diff --git a/jni/libsndfile/src/.deps/ogg_pcm.Plo b/jni/libsndfile/sources/src/.deps/ogg_pcm.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ogg_pcm.Plo
rename to jni/libsndfile/sources/src/.deps/ogg_pcm.Plo
diff --git a/jni/libsndfile/src/.deps/ogg_speex.Plo b/jni/libsndfile/sources/src/.deps/ogg_speex.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ogg_speex.Plo
rename to jni/libsndfile/sources/src/.deps/ogg_speex.Plo
diff --git a/jni/libsndfile/src/.deps/ogg_vorbis.Plo b/jni/libsndfile/sources/src/.deps/ogg_vorbis.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ogg_vorbis.Plo
rename to jni/libsndfile/sources/src/.deps/ogg_vorbis.Plo
diff --git a/jni/libsndfile/src/.deps/paf.Plo b/jni/libsndfile/sources/src/.deps/paf.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/paf.Plo
rename to jni/libsndfile/sources/src/.deps/paf.Plo
diff --git a/jni/libsndfile/src/.deps/pcm.Plo b/jni/libsndfile/sources/src/.deps/pcm.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/pcm.Plo
rename to jni/libsndfile/sources/src/.deps/pcm.Plo
diff --git a/jni/libsndfile/src/.deps/pvf.Plo b/jni/libsndfile/sources/src/.deps/pvf.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/pvf.Plo
rename to jni/libsndfile/sources/src/.deps/pvf.Plo
diff --git a/jni/libsndfile/src/.deps/raw.Plo b/jni/libsndfile/sources/src/.deps/raw.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/raw.Plo
rename to jni/libsndfile/sources/src/.deps/raw.Plo
diff --git a/jni/libsndfile/src/.deps/rf64.Plo b/jni/libsndfile/sources/src/.deps/rf64.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/rf64.Plo
rename to jni/libsndfile/sources/src/.deps/rf64.Plo
diff --git a/jni/libsndfile/src/.deps/rx2.Plo b/jni/libsndfile/sources/src/.deps/rx2.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/rx2.Plo
rename to jni/libsndfile/sources/src/.deps/rx2.Plo
diff --git a/jni/libsndfile/src/.deps/sd2.Plo b/jni/libsndfile/sources/src/.deps/sd2.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/sd2.Plo
rename to jni/libsndfile/sources/src/.deps/sd2.Plo
diff --git a/jni/libsndfile/src/.deps/sds.Plo b/jni/libsndfile/sources/src/.deps/sds.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/sds.Plo
rename to jni/libsndfile/sources/src/.deps/sds.Plo
diff --git a/jni/libsndfile/src/.deps/sndfile.Plo b/jni/libsndfile/sources/src/.deps/sndfile.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/sndfile.Plo
rename to jni/libsndfile/sources/src/.deps/sndfile.Plo
diff --git a/jni/libsndfile/src/.deps/strings.Plo b/jni/libsndfile/sources/src/.deps/strings.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/strings.Plo
rename to jni/libsndfile/sources/src/.deps/strings.Plo
diff --git a/jni/libsndfile/src/.deps/svx.Plo b/jni/libsndfile/sources/src/.deps/svx.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/svx.Plo
rename to jni/libsndfile/sources/src/.deps/svx.Plo
diff --git a/jni/libsndfile/src/.deps/test_audio_detect.Po b/jni/libsndfile/sources/src/.deps/test_audio_detect.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_audio_detect.Po
rename to jni/libsndfile/sources/src/.deps/test_audio_detect.Po
diff --git a/jni/libsndfile/src/.deps/test_broadcast_var.Po b/jni/libsndfile/sources/src/.deps/test_broadcast_var.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_broadcast_var.Po
rename to jni/libsndfile/sources/src/.deps/test_broadcast_var.Po
diff --git a/jni/libsndfile/src/.deps/test_conversions.Po b/jni/libsndfile/sources/src/.deps/test_conversions.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_conversions.Po
rename to jni/libsndfile/sources/src/.deps/test_conversions.Po
diff --git a/jni/libsndfile/src/.deps/test_endswap.Po b/jni/libsndfile/sources/src/.deps/test_endswap.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_endswap.Po
rename to jni/libsndfile/sources/src/.deps/test_endswap.Po
diff --git a/jni/libsndfile/src/.deps/test_file_io.Po b/jni/libsndfile/sources/src/.deps/test_file_io.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_file_io.Po
rename to jni/libsndfile/sources/src/.deps/test_file_io.Po
diff --git a/jni/libsndfile/src/.deps/test_float.Po b/jni/libsndfile/sources/src/.deps/test_float.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_float.Po
rename to jni/libsndfile/sources/src/.deps/test_float.Po
diff --git a/jni/libsndfile/src/.deps/test_ima_oki_adpcm.Po b/jni/libsndfile/sources/src/.deps/test_ima_oki_adpcm.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_ima_oki_adpcm.Po
rename to jni/libsndfile/sources/src/.deps/test_ima_oki_adpcm.Po
diff --git a/jni/libsndfile/src/.deps/test_log_printf.Po b/jni/libsndfile/sources/src/.deps/test_log_printf.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_log_printf.Po
rename to jni/libsndfile/sources/src/.deps/test_log_printf.Po
diff --git a/jni/libsndfile/src/.deps/test_main.Po b/jni/libsndfile/sources/src/.deps/test_main.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_main.Po
rename to jni/libsndfile/sources/src/.deps/test_main.Po
diff --git a/jni/libsndfile/src/.deps/test_strncpy_crlf.Po b/jni/libsndfile/sources/src/.deps/test_strncpy_crlf.Po
similarity index 100%
rename from jni/libsndfile/src/.deps/test_strncpy_crlf.Po
rename to jni/libsndfile/sources/src/.deps/test_strncpy_crlf.Po
diff --git a/jni/libsndfile/src/.deps/txw.Plo b/jni/libsndfile/sources/src/.deps/txw.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/txw.Plo
rename to jni/libsndfile/sources/src/.deps/txw.Plo
diff --git a/jni/libsndfile/src/.deps/ulaw.Plo b/jni/libsndfile/sources/src/.deps/ulaw.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/ulaw.Plo
rename to jni/libsndfile/sources/src/.deps/ulaw.Plo
diff --git a/jni/libsndfile/src/.deps/voc.Plo b/jni/libsndfile/sources/src/.deps/voc.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/voc.Plo
rename to jni/libsndfile/sources/src/.deps/voc.Plo
diff --git a/jni/libsndfile/src/.deps/vox_adpcm.Plo b/jni/libsndfile/sources/src/.deps/vox_adpcm.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/vox_adpcm.Plo
rename to jni/libsndfile/sources/src/.deps/vox_adpcm.Plo
diff --git a/jni/libsndfile/src/.deps/w64.Plo b/jni/libsndfile/sources/src/.deps/w64.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/w64.Plo
rename to jni/libsndfile/sources/src/.deps/w64.Plo
diff --git a/jni/libsndfile/src/.deps/wav.Plo b/jni/libsndfile/sources/src/.deps/wav.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/wav.Plo
rename to jni/libsndfile/sources/src/.deps/wav.Plo
diff --git a/jni/libsndfile/src/.deps/wav_w64.Plo b/jni/libsndfile/sources/src/.deps/wav_w64.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/wav_w64.Plo
rename to jni/libsndfile/sources/src/.deps/wav_w64.Plo
diff --git a/jni/libsndfile/src/.deps/windows.Plo b/jni/libsndfile/sources/src/.deps/windows.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/windows.Plo
rename to jni/libsndfile/sources/src/.deps/windows.Plo
diff --git a/jni/libsndfile/src/.deps/wve.Plo b/jni/libsndfile/sources/src/.deps/wve.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/wve.Plo
rename to jni/libsndfile/sources/src/.deps/wve.Plo
diff --git a/jni/libsndfile/src/.deps/xi.Plo b/jni/libsndfile/sources/src/.deps/xi.Plo
similarity index 100%
rename from jni/libsndfile/src/.deps/xi.Plo
rename to jni/libsndfile/sources/src/.deps/xi.Plo
diff --git a/jni/libsndfile/src/.libs/libcommon.a b/jni/libsndfile/sources/src/.libs/libcommon.a
similarity index 100%
rename from jni/libsndfile/src/.libs/libcommon.a
rename to jni/libsndfile/sources/src/.libs/libcommon.a
Binary files differ
diff --git a/jni/libsndfile/src/.libs/libcommon.la b/jni/libsndfile/sources/src/.libs/libcommon.la
similarity index 100%
rename from jni/libsndfile/src/.libs/libcommon.la
rename to jni/libsndfile/sources/src/.libs/libcommon.la
diff --git a/jni/libsndfile/src/.libs/libsndfile.a b/jni/libsndfile/sources/src/.libs/libsndfile.a
similarity index 100%
rename from jni/libsndfile/src/.libs/libsndfile.a
rename to jni/libsndfile/sources/src/.libs/libsndfile.a
Binary files differ
diff --git a/jni/libsndfile/src/.libs/libsndfile.la b/jni/libsndfile/sources/src/.libs/libsndfile.la
similarity index 100%
rename from jni/libsndfile/src/.libs/libsndfile.la
rename to jni/libsndfile/sources/src/.libs/libsndfile.la
diff --git a/jni/libsndfile/src/.libs/libsndfile.lai b/jni/libsndfile/sources/src/.libs/libsndfile.lai
similarity index 100%
rename from jni/libsndfile/src/.libs/libsndfile.lai
rename to jni/libsndfile/sources/src/.libs/libsndfile.lai
diff --git a/jni/libsndfile/src/.libs/libsndfile.so b/jni/libsndfile/sources/src/.libs/libsndfile.so
similarity index 100%
rename from jni/libsndfile/src/.libs/libsndfile.so
rename to jni/libsndfile/sources/src/.libs/libsndfile.so
diff --git a/jni/libsndfile/src/.libs/libsndfile.so.1 b/jni/libsndfile/sources/src/.libs/libsndfile.so.1
similarity index 100%
rename from jni/libsndfile/src/.libs/libsndfile.so.1
rename to jni/libsndfile/sources/src/.libs/libsndfile.so.1
diff --git a/jni/libsndfile/src/.libs/libsndfile.so.1.0.25 b/jni/libsndfile/sources/src/.libs/libsndfile.so.1.0.25
similarity index 100%
rename from jni/libsndfile/src/.libs/libsndfile.so.1.0.25
rename to jni/libsndfile/sources/src/.libs/libsndfile.so.1.0.25
Binary files differ
diff --git a/jni/libsndfile/src/G72x/.deps/.dirstamp b/jni/libsndfile/sources/src/G72x/.deps/.dirstamp
similarity index 100%
rename from jni/libsndfile/src/G72x/.deps/.dirstamp
rename to jni/libsndfile/sources/src/G72x/.deps/.dirstamp
diff --git a/jni/libsndfile/src/G72x/.deps/g721.Plo b/jni/libsndfile/sources/src/G72x/.deps/g721.Plo
similarity index 100%
rename from jni/libsndfile/src/G72x/.deps/g721.Plo
rename to jni/libsndfile/sources/src/G72x/.deps/g721.Plo
diff --git a/jni/libsndfile/src/G72x/.deps/g723_16.Plo b/jni/libsndfile/sources/src/G72x/.deps/g723_16.Plo
similarity index 100%
rename from jni/libsndfile/src/G72x/.deps/g723_16.Plo
rename to jni/libsndfile/sources/src/G72x/.deps/g723_16.Plo
diff --git a/jni/libsndfile/src/G72x/.deps/g723_24.Plo b/jni/libsndfile/sources/src/G72x/.deps/g723_24.Plo
similarity index 100%
rename from jni/libsndfile/src/G72x/.deps/g723_24.Plo
rename to jni/libsndfile/sources/src/G72x/.deps/g723_24.Plo
diff --git a/jni/libsndfile/src/G72x/.deps/g723_40.Plo b/jni/libsndfile/sources/src/G72x/.deps/g723_40.Plo
similarity index 100%
rename from jni/libsndfile/src/G72x/.deps/g723_40.Plo
rename to jni/libsndfile/sources/src/G72x/.deps/g723_40.Plo
diff --git a/jni/libsndfile/src/G72x/.deps/g72x.Plo b/jni/libsndfile/sources/src/G72x/.deps/g72x.Plo
similarity index 100%
rename from jni/libsndfile/src/G72x/.deps/g72x.Plo
rename to jni/libsndfile/sources/src/G72x/.deps/g72x.Plo
diff --git a/jni/libsndfile/src/G72x/.deps/g72x_test.Po b/jni/libsndfile/sources/src/G72x/.deps/g72x_test.Po
similarity index 100%
rename from jni/libsndfile/src/G72x/.deps/g72x_test.Po
rename to jni/libsndfile/sources/src/G72x/.deps/g72x_test.Po
diff --git a/jni/libsndfile/src/G72x/.dirstamp b/jni/libsndfile/sources/src/G72x/.dirstamp
similarity index 100%
rename from jni/libsndfile/src/G72x/.dirstamp
rename to jni/libsndfile/sources/src/G72x/.dirstamp
diff --git a/jni/libsndfile/src/G72x/.libs/libg72x.a b/jni/libsndfile/sources/src/G72x/.libs/libg72x.a
similarity index 100%
rename from jni/libsndfile/src/G72x/.libs/libg72x.a
rename to jni/libsndfile/sources/src/G72x/.libs/libg72x.a
Binary files differ
diff --git a/jni/libsndfile/src/G72x/.libs/libg72x.la b/jni/libsndfile/sources/src/G72x/.libs/libg72x.la
similarity index 100%
rename from jni/libsndfile/src/G72x/.libs/libg72x.la
rename to jni/libsndfile/sources/src/G72x/.libs/libg72x.la
diff --git a/jni/libsndfile/src/G72x/ChangeLog b/jni/libsndfile/sources/src/G72x/ChangeLog
similarity index 100%
rename from jni/libsndfile/src/G72x/ChangeLog
rename to jni/libsndfile/sources/src/G72x/ChangeLog
diff --git a/jni/libsndfile/src/G72x/README b/jni/libsndfile/sources/src/G72x/README
similarity index 100%
rename from jni/libsndfile/src/G72x/README
rename to jni/libsndfile/sources/src/G72x/README
diff --git a/jni/libsndfile/src/G72x/README.original b/jni/libsndfile/sources/src/G72x/README.original
similarity index 100%
rename from jni/libsndfile/src/G72x/README.original
rename to jni/libsndfile/sources/src/G72x/README.original
diff --git a/jni/libsndfile/src/G72x/g721.c b/jni/libsndfile/sources/src/G72x/g721.c
similarity index 100%
rename from jni/libsndfile/src/G72x/g721.c
rename to jni/libsndfile/sources/src/G72x/g721.c
diff --git a/jni/libsndfile/src/G72x/g721.lo b/jni/libsndfile/sources/src/G72x/g721.lo
similarity index 100%
rename from jni/libsndfile/src/G72x/g721.lo
rename to jni/libsndfile/sources/src/G72x/g721.lo
diff --git a/jni/libsndfile/src/G72x/g723_16.c b/jni/libsndfile/sources/src/G72x/g723_16.c
similarity index 100%
rename from jni/libsndfile/src/G72x/g723_16.c
rename to jni/libsndfile/sources/src/G72x/g723_16.c
diff --git a/jni/libsndfile/src/G72x/g723_16.lo b/jni/libsndfile/sources/src/G72x/g723_16.lo
similarity index 100%
rename from jni/libsndfile/src/G72x/g723_16.lo
rename to jni/libsndfile/sources/src/G72x/g723_16.lo
diff --git a/jni/libsndfile/src/G72x/g723_24.c b/jni/libsndfile/sources/src/G72x/g723_24.c
similarity index 100%
rename from jni/libsndfile/src/G72x/g723_24.c
rename to jni/libsndfile/sources/src/G72x/g723_24.c
diff --git a/jni/libsndfile/src/G72x/g723_24.lo b/jni/libsndfile/sources/src/G72x/g723_24.lo
similarity index 100%
rename from jni/libsndfile/src/G72x/g723_24.lo
rename to jni/libsndfile/sources/src/G72x/g723_24.lo
diff --git a/jni/libsndfile/src/G72x/g723_40.c b/jni/libsndfile/sources/src/G72x/g723_40.c
similarity index 100%
rename from jni/libsndfile/src/G72x/g723_40.c
rename to jni/libsndfile/sources/src/G72x/g723_40.c
diff --git a/jni/libsndfile/src/G72x/g723_40.lo b/jni/libsndfile/sources/src/G72x/g723_40.lo
similarity index 100%
rename from jni/libsndfile/src/G72x/g723_40.lo
rename to jni/libsndfile/sources/src/G72x/g723_40.lo
diff --git a/jni/libsndfile/src/G72x/g72x.c b/jni/libsndfile/sources/src/G72x/g72x.c
similarity index 100%
rename from jni/libsndfile/src/G72x/g72x.c
rename to jni/libsndfile/sources/src/G72x/g72x.c
diff --git a/jni/libsndfile/src/G72x/g72x.h b/jni/libsndfile/sources/src/G72x/g72x.h
similarity index 100%
rename from jni/libsndfile/src/G72x/g72x.h
rename to jni/libsndfile/sources/src/G72x/g72x.h
diff --git a/jni/libsndfile/src/G72x/g72x.lo b/jni/libsndfile/sources/src/G72x/g72x.lo
similarity index 100%
rename from jni/libsndfile/src/G72x/g72x.lo
rename to jni/libsndfile/sources/src/G72x/g72x.lo
diff --git a/jni/libsndfile/src/G72x/g72x_priv.h b/jni/libsndfile/sources/src/G72x/g72x_priv.h
similarity index 100%
rename from jni/libsndfile/src/G72x/g72x_priv.h
rename to jni/libsndfile/sources/src/G72x/g72x_priv.h
diff --git a/jni/libsndfile/src/G72x/g72x_test.c b/jni/libsndfile/sources/src/G72x/g72x_test.c
similarity index 100%
rename from jni/libsndfile/src/G72x/g72x_test.c
rename to jni/libsndfile/sources/src/G72x/g72x_test.c
diff --git a/jni/libsndfile/src/G72x/libg72x.la b/jni/libsndfile/sources/src/G72x/libg72x.la
similarity index 100%
rename from jni/libsndfile/src/G72x/libg72x.la
rename to jni/libsndfile/sources/src/G72x/libg72x.la
diff --git a/jni/libsndfile/src/GSM610/.deps/.dirstamp b/jni/libsndfile/sources/src/GSM610/.deps/.dirstamp
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/.dirstamp
rename to jni/libsndfile/sources/src/GSM610/.deps/.dirstamp
diff --git a/jni/libsndfile/src/GSM610/.deps/add.Plo b/jni/libsndfile/sources/src/GSM610/.deps/add.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/add.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/add.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/code.Plo b/jni/libsndfile/sources/src/GSM610/.deps/code.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/code.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/code.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/decode.Plo b/jni/libsndfile/sources/src/GSM610/.deps/decode.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/decode.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/decode.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/gsm_create.Plo b/jni/libsndfile/sources/src/GSM610/.deps/gsm_create.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/gsm_create.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/gsm_create.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/gsm_decode.Plo b/jni/libsndfile/sources/src/GSM610/.deps/gsm_decode.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/gsm_decode.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/gsm_decode.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/gsm_destroy.Plo b/jni/libsndfile/sources/src/GSM610/.deps/gsm_destroy.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/gsm_destroy.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/gsm_destroy.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/gsm_encode.Plo b/jni/libsndfile/sources/src/GSM610/.deps/gsm_encode.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/gsm_encode.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/gsm_encode.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/gsm_option.Plo b/jni/libsndfile/sources/src/GSM610/.deps/gsm_option.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/gsm_option.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/gsm_option.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/long_term.Plo b/jni/libsndfile/sources/src/GSM610/.deps/long_term.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/long_term.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/long_term.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/lpc.Plo b/jni/libsndfile/sources/src/GSM610/.deps/lpc.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/lpc.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/lpc.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/preprocess.Plo b/jni/libsndfile/sources/src/GSM610/.deps/preprocess.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/preprocess.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/preprocess.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/rpe.Plo b/jni/libsndfile/sources/src/GSM610/.deps/rpe.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/rpe.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/rpe.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/short_term.Plo b/jni/libsndfile/sources/src/GSM610/.deps/short_term.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/short_term.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/short_term.Plo
diff --git a/jni/libsndfile/src/GSM610/.deps/table.Plo b/jni/libsndfile/sources/src/GSM610/.deps/table.Plo
similarity index 100%
rename from jni/libsndfile/src/GSM610/.deps/table.Plo
rename to jni/libsndfile/sources/src/GSM610/.deps/table.Plo
diff --git a/jni/libsndfile/src/GSM610/.dirstamp b/jni/libsndfile/sources/src/GSM610/.dirstamp
similarity index 100%
rename from jni/libsndfile/src/GSM610/.dirstamp
rename to jni/libsndfile/sources/src/GSM610/.dirstamp
diff --git a/jni/libsndfile/src/GSM610/.libs/libgsm.a b/jni/libsndfile/sources/src/GSM610/.libs/libgsm.a
similarity index 100%
rename from jni/libsndfile/src/GSM610/.libs/libgsm.a
rename to jni/libsndfile/sources/src/GSM610/.libs/libgsm.a
Binary files differ
diff --git a/jni/libsndfile/src/GSM610/.libs/libgsm.la b/jni/libsndfile/sources/src/GSM610/.libs/libgsm.la
similarity index 100%
rename from jni/libsndfile/src/GSM610/.libs/libgsm.la
rename to jni/libsndfile/sources/src/GSM610/.libs/libgsm.la
diff --git a/jni/libsndfile/src/GSM610/COPYRIGHT b/jni/libsndfile/sources/src/GSM610/COPYRIGHT
similarity index 100%
rename from jni/libsndfile/src/GSM610/COPYRIGHT
rename to jni/libsndfile/sources/src/GSM610/COPYRIGHT
diff --git a/jni/libsndfile/src/GSM610/ChangeLog b/jni/libsndfile/sources/src/GSM610/ChangeLog
similarity index 100%
rename from jni/libsndfile/src/GSM610/ChangeLog
rename to jni/libsndfile/sources/src/GSM610/ChangeLog
diff --git a/jni/libsndfile/src/GSM610/README b/jni/libsndfile/sources/src/GSM610/README
similarity index 100%
rename from jni/libsndfile/src/GSM610/README
rename to jni/libsndfile/sources/src/GSM610/README
diff --git a/jni/libsndfile/src/GSM610/add.c b/jni/libsndfile/sources/src/GSM610/add.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/add.c
rename to jni/libsndfile/sources/src/GSM610/add.c
diff --git a/jni/libsndfile/src/GSM610/add.lo b/jni/libsndfile/sources/src/GSM610/add.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/add.lo
rename to jni/libsndfile/sources/src/GSM610/add.lo
diff --git a/jni/libsndfile/src/GSM610/code.c b/jni/libsndfile/sources/src/GSM610/code.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/code.c
rename to jni/libsndfile/sources/src/GSM610/code.c
diff --git a/jni/libsndfile/src/GSM610/code.lo b/jni/libsndfile/sources/src/GSM610/code.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/code.lo
rename to jni/libsndfile/sources/src/GSM610/code.lo
diff --git a/jni/libsndfile/src/GSM610/config.h b/jni/libsndfile/sources/src/GSM610/config.h
similarity index 100%
rename from jni/libsndfile/src/GSM610/config.h
rename to jni/libsndfile/sources/src/GSM610/config.h
diff --git a/jni/libsndfile/src/GSM610/decode.c b/jni/libsndfile/sources/src/GSM610/decode.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/decode.c
rename to jni/libsndfile/sources/src/GSM610/decode.c
diff --git a/jni/libsndfile/src/GSM610/decode.lo b/jni/libsndfile/sources/src/GSM610/decode.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/decode.lo
rename to jni/libsndfile/sources/src/GSM610/decode.lo
diff --git a/jni/libsndfile/src/GSM610/gsm.h b/jni/libsndfile/sources/src/GSM610/gsm.h
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm.h
rename to jni/libsndfile/sources/src/GSM610/gsm.h
diff --git a/jni/libsndfile/src/GSM610/gsm610_priv.h b/jni/libsndfile/sources/src/GSM610/gsm610_priv.h
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm610_priv.h
rename to jni/libsndfile/sources/src/GSM610/gsm610_priv.h
diff --git a/jni/libsndfile/src/GSM610/gsm_create.c b/jni/libsndfile/sources/src/GSM610/gsm_create.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_create.c
rename to jni/libsndfile/sources/src/GSM610/gsm_create.c
diff --git a/jni/libsndfile/src/GSM610/gsm_create.lo b/jni/libsndfile/sources/src/GSM610/gsm_create.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_create.lo
rename to jni/libsndfile/sources/src/GSM610/gsm_create.lo
diff --git a/jni/libsndfile/src/GSM610/gsm_decode.c b/jni/libsndfile/sources/src/GSM610/gsm_decode.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_decode.c
rename to jni/libsndfile/sources/src/GSM610/gsm_decode.c
diff --git a/jni/libsndfile/src/GSM610/gsm_decode.lo b/jni/libsndfile/sources/src/GSM610/gsm_decode.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_decode.lo
rename to jni/libsndfile/sources/src/GSM610/gsm_decode.lo
diff --git a/jni/libsndfile/src/GSM610/gsm_destroy.c b/jni/libsndfile/sources/src/GSM610/gsm_destroy.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_destroy.c
rename to jni/libsndfile/sources/src/GSM610/gsm_destroy.c
diff --git a/jni/libsndfile/src/GSM610/gsm_destroy.lo b/jni/libsndfile/sources/src/GSM610/gsm_destroy.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_destroy.lo
rename to jni/libsndfile/sources/src/GSM610/gsm_destroy.lo
diff --git a/jni/libsndfile/src/GSM610/gsm_encode.c b/jni/libsndfile/sources/src/GSM610/gsm_encode.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_encode.c
rename to jni/libsndfile/sources/src/GSM610/gsm_encode.c
diff --git a/jni/libsndfile/src/GSM610/gsm_encode.lo b/jni/libsndfile/sources/src/GSM610/gsm_encode.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_encode.lo
rename to jni/libsndfile/sources/src/GSM610/gsm_encode.lo
diff --git a/jni/libsndfile/src/GSM610/gsm_option.c b/jni/libsndfile/sources/src/GSM610/gsm_option.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_option.c
rename to jni/libsndfile/sources/src/GSM610/gsm_option.c
diff --git a/jni/libsndfile/src/GSM610/gsm_option.lo b/jni/libsndfile/sources/src/GSM610/gsm_option.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/gsm_option.lo
rename to jni/libsndfile/sources/src/GSM610/gsm_option.lo
diff --git a/jni/libsndfile/src/GSM610/libgsm.la b/jni/libsndfile/sources/src/GSM610/libgsm.la
similarity index 100%
rename from jni/libsndfile/src/GSM610/libgsm.la
rename to jni/libsndfile/sources/src/GSM610/libgsm.la
diff --git a/jni/libsndfile/src/GSM610/long_term.c b/jni/libsndfile/sources/src/GSM610/long_term.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/long_term.c
rename to jni/libsndfile/sources/src/GSM610/long_term.c
diff --git a/jni/libsndfile/src/GSM610/long_term.lo b/jni/libsndfile/sources/src/GSM610/long_term.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/long_term.lo
rename to jni/libsndfile/sources/src/GSM610/long_term.lo
diff --git a/jni/libsndfile/src/GSM610/lpc.c b/jni/libsndfile/sources/src/GSM610/lpc.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/lpc.c
rename to jni/libsndfile/sources/src/GSM610/lpc.c
diff --git a/jni/libsndfile/src/GSM610/lpc.lo b/jni/libsndfile/sources/src/GSM610/lpc.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/lpc.lo
rename to jni/libsndfile/sources/src/GSM610/lpc.lo
diff --git a/jni/libsndfile/src/GSM610/preprocess.c b/jni/libsndfile/sources/src/GSM610/preprocess.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/preprocess.c
rename to jni/libsndfile/sources/src/GSM610/preprocess.c
diff --git a/jni/libsndfile/src/GSM610/preprocess.lo b/jni/libsndfile/sources/src/GSM610/preprocess.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/preprocess.lo
rename to jni/libsndfile/sources/src/GSM610/preprocess.lo
diff --git a/jni/libsndfile/src/GSM610/rpe.c b/jni/libsndfile/sources/src/GSM610/rpe.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/rpe.c
rename to jni/libsndfile/sources/src/GSM610/rpe.c
diff --git a/jni/libsndfile/src/GSM610/rpe.lo b/jni/libsndfile/sources/src/GSM610/rpe.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/rpe.lo
rename to jni/libsndfile/sources/src/GSM610/rpe.lo
diff --git a/jni/libsndfile/src/GSM610/short_term.c b/jni/libsndfile/sources/src/GSM610/short_term.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/short_term.c
rename to jni/libsndfile/sources/src/GSM610/short_term.c
diff --git a/jni/libsndfile/src/GSM610/short_term.lo b/jni/libsndfile/sources/src/GSM610/short_term.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/short_term.lo
rename to jni/libsndfile/sources/src/GSM610/short_term.lo
diff --git a/jni/libsndfile/src/GSM610/table.c b/jni/libsndfile/sources/src/GSM610/table.c
similarity index 100%
rename from jni/libsndfile/src/GSM610/table.c
rename to jni/libsndfile/sources/src/GSM610/table.c
diff --git a/jni/libsndfile/src/GSM610/table.lo b/jni/libsndfile/sources/src/GSM610/table.lo
similarity index 100%
rename from jni/libsndfile/src/GSM610/table.lo
rename to jni/libsndfile/sources/src/GSM610/table.lo
diff --git a/jni/libsndfile/src/Makefile b/jni/libsndfile/sources/src/Makefile
similarity index 100%
rename from jni/libsndfile/src/Makefile
rename to jni/libsndfile/sources/src/Makefile
diff --git a/jni/libsndfile/src/Makefile.am b/jni/libsndfile/sources/src/Makefile.am
similarity index 100%
rename from jni/libsndfile/src/Makefile.am
rename to jni/libsndfile/sources/src/Makefile.am
diff --git a/jni/libsndfile/src/Makefile.in b/jni/libsndfile/sources/src/Makefile.in
similarity index 100%
rename from jni/libsndfile/src/Makefile.in
rename to jni/libsndfile/sources/src/Makefile.in
diff --git a/jni/libsndfile/src/Symbols.darwin b/jni/libsndfile/sources/src/Symbols.darwin
similarity index 100%
rename from jni/libsndfile/src/Symbols.darwin
rename to jni/libsndfile/sources/src/Symbols.darwin
diff --git a/jni/libsndfile/src/Symbols.gnu-binutils b/jni/libsndfile/sources/src/Symbols.gnu-binutils
similarity index 100%
rename from jni/libsndfile/src/Symbols.gnu-binutils
rename to jni/libsndfile/sources/src/Symbols.gnu-binutils
diff --git a/jni/libsndfile/src/Symbols.os2 b/jni/libsndfile/sources/src/Symbols.os2
similarity index 100%
rename from jni/libsndfile/src/Symbols.os2
rename to jni/libsndfile/sources/src/Symbols.os2
diff --git a/jni/libsndfile/src/Symbols.static b/jni/libsndfile/sources/src/Symbols.static
similarity index 100%
rename from jni/libsndfile/src/Symbols.static
rename to jni/libsndfile/sources/src/Symbols.static
diff --git a/jni/libsndfile/src/aiff.c b/jni/libsndfile/sources/src/aiff.c
similarity index 100%
rename from jni/libsndfile/src/aiff.c
rename to jni/libsndfile/sources/src/aiff.c
diff --git a/jni/libsndfile/src/aiff.lo b/jni/libsndfile/sources/src/aiff.lo
similarity index 100%
rename from jni/libsndfile/src/aiff.lo
rename to jni/libsndfile/sources/src/aiff.lo
diff --git a/jni/libsndfile/src/alaw.c b/jni/libsndfile/sources/src/alaw.c
similarity index 100%
rename from jni/libsndfile/src/alaw.c
rename to jni/libsndfile/sources/src/alaw.c
diff --git a/jni/libsndfile/src/alaw.lo b/jni/libsndfile/sources/src/alaw.lo
similarity index 100%
rename from jni/libsndfile/src/alaw.lo
rename to jni/libsndfile/sources/src/alaw.lo
diff --git a/jni/libsndfile/src/au.c b/jni/libsndfile/sources/src/au.c
similarity index 100%
rename from jni/libsndfile/src/au.c
rename to jni/libsndfile/sources/src/au.c
diff --git a/jni/libsndfile/src/au.lo b/jni/libsndfile/sources/src/au.lo
similarity index 100%
rename from jni/libsndfile/src/au.lo
rename to jni/libsndfile/sources/src/au.lo
diff --git a/jni/libsndfile/src/audio_detect.c b/jni/libsndfile/sources/src/audio_detect.c
similarity index 100%
rename from jni/libsndfile/src/audio_detect.c
rename to jni/libsndfile/sources/src/audio_detect.c
diff --git a/jni/libsndfile/src/audio_detect.lo b/jni/libsndfile/sources/src/audio_detect.lo
similarity index 100%
rename from jni/libsndfile/src/audio_detect.lo
rename to jni/libsndfile/sources/src/audio_detect.lo
diff --git a/jni/libsndfile/src/avr.c b/jni/libsndfile/sources/src/avr.c
similarity index 100%
rename from jni/libsndfile/src/avr.c
rename to jni/libsndfile/sources/src/avr.c
diff --git a/jni/libsndfile/src/avr.lo b/jni/libsndfile/sources/src/avr.lo
similarity index 100%
rename from jni/libsndfile/src/avr.lo
rename to jni/libsndfile/sources/src/avr.lo
diff --git a/jni/libsndfile/src/binheader_writef_check.py b/jni/libsndfile/sources/src/binheader_writef_check.py
similarity index 100%
rename from jni/libsndfile/src/binheader_writef_check.py
rename to jni/libsndfile/sources/src/binheader_writef_check.py
diff --git a/jni/libsndfile/src/broadcast.c b/jni/libsndfile/sources/src/broadcast.c
similarity index 100%
rename from jni/libsndfile/src/broadcast.c
rename to jni/libsndfile/sources/src/broadcast.c
diff --git a/jni/libsndfile/src/broadcast.lo b/jni/libsndfile/sources/src/broadcast.lo
similarity index 100%
rename from jni/libsndfile/src/broadcast.lo
rename to jni/libsndfile/sources/src/broadcast.lo
diff --git a/jni/libsndfile/src/caf.c b/jni/libsndfile/sources/src/caf.c
similarity index 100%
rename from jni/libsndfile/src/caf.c
rename to jni/libsndfile/sources/src/caf.c
diff --git a/jni/libsndfile/src/caf.lo b/jni/libsndfile/sources/src/caf.lo
similarity index 100%
rename from jni/libsndfile/src/caf.lo
rename to jni/libsndfile/sources/src/caf.lo
diff --git a/jni/libsndfile/src/chanmap.c b/jni/libsndfile/sources/src/chanmap.c
similarity index 100%
rename from jni/libsndfile/src/chanmap.c
rename to jni/libsndfile/sources/src/chanmap.c
diff --git a/jni/libsndfile/src/chanmap.h b/jni/libsndfile/sources/src/chanmap.h
similarity index 100%
rename from jni/libsndfile/src/chanmap.h
rename to jni/libsndfile/sources/src/chanmap.h
diff --git a/jni/libsndfile/src/chanmap.lo b/jni/libsndfile/sources/src/chanmap.lo
similarity index 100%
rename from jni/libsndfile/src/chanmap.lo
rename to jni/libsndfile/sources/src/chanmap.lo
diff --git a/jni/libsndfile/src/chunk.c b/jni/libsndfile/sources/src/chunk.c
similarity index 100%
rename from jni/libsndfile/src/chunk.c
rename to jni/libsndfile/sources/src/chunk.c
diff --git a/jni/libsndfile/src/chunk.lo b/jni/libsndfile/sources/src/chunk.lo
similarity index 100%
rename from jni/libsndfile/src/chunk.lo
rename to jni/libsndfile/sources/src/chunk.lo
diff --git a/jni/libsndfile/src/command.c b/jni/libsndfile/sources/src/command.c
similarity index 100%
rename from jni/libsndfile/src/command.c
rename to jni/libsndfile/sources/src/command.c
diff --git a/jni/libsndfile/src/command.lo b/jni/libsndfile/sources/src/command.lo
similarity index 100%
rename from jni/libsndfile/src/command.lo
rename to jni/libsndfile/sources/src/command.lo
diff --git a/jni/libsndfile/src/common.c b/jni/libsndfile/sources/src/common.c
similarity index 100%
rename from jni/libsndfile/src/common.c
rename to jni/libsndfile/sources/src/common.c
diff --git a/jni/libsndfile/src/common.h b/jni/libsndfile/sources/src/common.h
similarity index 100%
rename from jni/libsndfile/src/common.h
rename to jni/libsndfile/sources/src/common.h
diff --git a/jni/libsndfile/src/common.lo b/jni/libsndfile/sources/src/common.lo
similarity index 100%
rename from jni/libsndfile/src/common.lo
rename to jni/libsndfile/sources/src/common.lo
diff --git a/jni/libsndfile/src/config.h b/jni/libsndfile/sources/src/config.h
similarity index 100%
rename from jni/libsndfile/src/config.h
rename to jni/libsndfile/sources/src/config.h
diff --git a/jni/libsndfile/src/config.h.in b/jni/libsndfile/sources/src/config.h.in
similarity index 100%
rename from jni/libsndfile/src/config.h.in
rename to jni/libsndfile/sources/src/config.h.in
diff --git a/jni/libsndfile/src/create_symbols_file.py b/jni/libsndfile/sources/src/create_symbols_file.py
similarity index 100%
rename from jni/libsndfile/src/create_symbols_file.py
rename to jni/libsndfile/sources/src/create_symbols_file.py
diff --git a/jni/libsndfile/src/dither.c b/jni/libsndfile/sources/src/dither.c
similarity index 100%
rename from jni/libsndfile/src/dither.c
rename to jni/libsndfile/sources/src/dither.c
diff --git a/jni/libsndfile/src/dither.lo b/jni/libsndfile/sources/src/dither.lo
similarity index 100%
rename from jni/libsndfile/src/dither.lo
rename to jni/libsndfile/sources/src/dither.lo
diff --git a/jni/libsndfile/src/double64.c b/jni/libsndfile/sources/src/double64.c
similarity index 100%
rename from jni/libsndfile/src/double64.c
rename to jni/libsndfile/sources/src/double64.c
diff --git a/jni/libsndfile/src/double64.lo b/jni/libsndfile/sources/src/double64.lo
similarity index 100%
rename from jni/libsndfile/src/double64.lo
rename to jni/libsndfile/sources/src/double64.lo
diff --git a/jni/libsndfile/src/dwd.c b/jni/libsndfile/sources/src/dwd.c
similarity index 100%
rename from jni/libsndfile/src/dwd.c
rename to jni/libsndfile/sources/src/dwd.c
diff --git a/jni/libsndfile/src/dwd.lo b/jni/libsndfile/sources/src/dwd.lo
similarity index 100%
rename from jni/libsndfile/src/dwd.lo
rename to jni/libsndfile/sources/src/dwd.lo
diff --git a/jni/libsndfile/src/dwvw.c b/jni/libsndfile/sources/src/dwvw.c
similarity index 100%
rename from jni/libsndfile/src/dwvw.c
rename to jni/libsndfile/sources/src/dwvw.c
diff --git a/jni/libsndfile/src/dwvw.lo b/jni/libsndfile/sources/src/dwvw.lo
similarity index 100%
rename from jni/libsndfile/src/dwvw.lo
rename to jni/libsndfile/sources/src/dwvw.lo
diff --git a/jni/libsndfile/src/file_io.c b/jni/libsndfile/sources/src/file_io.c
similarity index 100%
rename from jni/libsndfile/src/file_io.c
rename to jni/libsndfile/sources/src/file_io.c
diff --git a/jni/libsndfile/src/file_io.lo b/jni/libsndfile/sources/src/file_io.lo
similarity index 100%
rename from jni/libsndfile/src/file_io.lo
rename to jni/libsndfile/sources/src/file_io.lo
diff --git a/jni/libsndfile/src/flac.c b/jni/libsndfile/sources/src/flac.c
similarity index 100%
rename from jni/libsndfile/src/flac.c
rename to jni/libsndfile/sources/src/flac.c
diff --git a/jni/libsndfile/src/flac.lo b/jni/libsndfile/sources/src/flac.lo
similarity index 100%
rename from jni/libsndfile/src/flac.lo
rename to jni/libsndfile/sources/src/flac.lo
diff --git a/jni/libsndfile/src/float32.c b/jni/libsndfile/sources/src/float32.c
similarity index 100%
rename from jni/libsndfile/src/float32.c
rename to jni/libsndfile/sources/src/float32.c
diff --git a/jni/libsndfile/src/float32.lo b/jni/libsndfile/sources/src/float32.lo
similarity index 100%
rename from jni/libsndfile/src/float32.lo
rename to jni/libsndfile/sources/src/float32.lo
diff --git a/jni/libsndfile/src/g72x.c b/jni/libsndfile/sources/src/g72x.c
similarity index 100%
rename from jni/libsndfile/src/g72x.c
rename to jni/libsndfile/sources/src/g72x.c
diff --git a/jni/libsndfile/src/g72x.lo b/jni/libsndfile/sources/src/g72x.lo
similarity index 100%
rename from jni/libsndfile/src/g72x.lo
rename to jni/libsndfile/sources/src/g72x.lo
diff --git a/jni/libsndfile/src/gsm610.c b/jni/libsndfile/sources/src/gsm610.c
similarity index 100%
rename from jni/libsndfile/src/gsm610.c
rename to jni/libsndfile/sources/src/gsm610.c
diff --git a/jni/libsndfile/src/gsm610.lo b/jni/libsndfile/sources/src/gsm610.lo
similarity index 100%
rename from jni/libsndfile/src/gsm610.lo
rename to jni/libsndfile/sources/src/gsm610.lo
diff --git a/jni/libsndfile/src/htk.c b/jni/libsndfile/sources/src/htk.c
similarity index 100%
rename from jni/libsndfile/src/htk.c
rename to jni/libsndfile/sources/src/htk.c
diff --git a/jni/libsndfile/src/htk.lo b/jni/libsndfile/sources/src/htk.lo
similarity index 100%
rename from jni/libsndfile/src/htk.lo
rename to jni/libsndfile/sources/src/htk.lo
diff --git a/jni/libsndfile/src/id3.c b/jni/libsndfile/sources/src/id3.c
similarity index 100%
rename from jni/libsndfile/src/id3.c
rename to jni/libsndfile/sources/src/id3.c
diff --git a/jni/libsndfile/src/id3.lo b/jni/libsndfile/sources/src/id3.lo
similarity index 100%
rename from jni/libsndfile/src/id3.lo
rename to jni/libsndfile/sources/src/id3.lo
diff --git a/jni/libsndfile/src/ima_adpcm.c b/jni/libsndfile/sources/src/ima_adpcm.c
similarity index 100%
rename from jni/libsndfile/src/ima_adpcm.c
rename to jni/libsndfile/sources/src/ima_adpcm.c
diff --git a/jni/libsndfile/src/ima_adpcm.lo b/jni/libsndfile/sources/src/ima_adpcm.lo
similarity index 100%
rename from jni/libsndfile/src/ima_adpcm.lo
rename to jni/libsndfile/sources/src/ima_adpcm.lo
diff --git a/jni/libsndfile/src/ima_oki_adpcm.c b/jni/libsndfile/sources/src/ima_oki_adpcm.c
similarity index 100%
rename from jni/libsndfile/src/ima_oki_adpcm.c
rename to jni/libsndfile/sources/src/ima_oki_adpcm.c
diff --git a/jni/libsndfile/src/ima_oki_adpcm.h b/jni/libsndfile/sources/src/ima_oki_adpcm.h
similarity index 100%
rename from jni/libsndfile/src/ima_oki_adpcm.h
rename to jni/libsndfile/sources/src/ima_oki_adpcm.h
diff --git a/jni/libsndfile/src/ima_oki_adpcm.lo b/jni/libsndfile/sources/src/ima_oki_adpcm.lo
similarity index 100%
rename from jni/libsndfile/src/ima_oki_adpcm.lo
rename to jni/libsndfile/sources/src/ima_oki_adpcm.lo
diff --git a/jni/libsndfile/src/interleave.c b/jni/libsndfile/sources/src/interleave.c
similarity index 100%
rename from jni/libsndfile/src/interleave.c
rename to jni/libsndfile/sources/src/interleave.c
diff --git a/jni/libsndfile/src/interleave.lo b/jni/libsndfile/sources/src/interleave.lo
similarity index 100%
rename from jni/libsndfile/src/interleave.lo
rename to jni/libsndfile/sources/src/interleave.lo
diff --git a/jni/libsndfile/src/ircam.c b/jni/libsndfile/sources/src/ircam.c
similarity index 100%
rename from jni/libsndfile/src/ircam.c
rename to jni/libsndfile/sources/src/ircam.c
diff --git a/jni/libsndfile/src/ircam.lo b/jni/libsndfile/sources/src/ircam.lo
similarity index 100%
rename from jni/libsndfile/src/ircam.lo
rename to jni/libsndfile/sources/src/ircam.lo
diff --git a/jni/libsndfile/src/libcommon.la b/jni/libsndfile/sources/src/libcommon.la
similarity index 100%
rename from jni/libsndfile/src/libcommon.la
rename to jni/libsndfile/sources/src/libcommon.la
diff --git a/jni/libsndfile/src/libsndfile-1.def b/jni/libsndfile/sources/src/libsndfile-1.def
similarity index 100%
rename from jni/libsndfile/src/libsndfile-1.def
rename to jni/libsndfile/sources/src/libsndfile-1.def
diff --git a/jni/libsndfile/src/libsndfile.la b/jni/libsndfile/sources/src/libsndfile.la
similarity index 100%
rename from jni/libsndfile/src/libsndfile.la
rename to jni/libsndfile/sources/src/libsndfile.la
diff --git a/jni/libsndfile/src/macbinary3.c b/jni/libsndfile/sources/src/macbinary3.c
similarity index 100%
rename from jni/libsndfile/src/macbinary3.c
rename to jni/libsndfile/sources/src/macbinary3.c
diff --git a/jni/libsndfile/src/macbinary3.lo b/jni/libsndfile/sources/src/macbinary3.lo
similarity index 100%
rename from jni/libsndfile/src/macbinary3.lo
rename to jni/libsndfile/sources/src/macbinary3.lo
diff --git a/jni/libsndfile/src/macos.c b/jni/libsndfile/sources/src/macos.c
similarity index 100%
rename from jni/libsndfile/src/macos.c
rename to jni/libsndfile/sources/src/macos.c
diff --git a/jni/libsndfile/src/macos.lo b/jni/libsndfile/sources/src/macos.lo
similarity index 100%
rename from jni/libsndfile/src/macos.lo
rename to jni/libsndfile/sources/src/macos.lo
diff --git a/jni/libsndfile/src/make-static-lib-hidden-privates.sh b/jni/libsndfile/sources/src/make-static-lib-hidden-privates.sh
similarity index 100%
rename from jni/libsndfile/src/make-static-lib-hidden-privates.sh
rename to jni/libsndfile/sources/src/make-static-lib-hidden-privates.sh
diff --git a/jni/libsndfile/src/mat4.c b/jni/libsndfile/sources/src/mat4.c
similarity index 100%
rename from jni/libsndfile/src/mat4.c
rename to jni/libsndfile/sources/src/mat4.c
diff --git a/jni/libsndfile/src/mat4.lo b/jni/libsndfile/sources/src/mat4.lo
similarity index 100%
rename from jni/libsndfile/src/mat4.lo
rename to jni/libsndfile/sources/src/mat4.lo
diff --git a/jni/libsndfile/src/mat5.c b/jni/libsndfile/sources/src/mat5.c
similarity index 100%
rename from jni/libsndfile/src/mat5.c
rename to jni/libsndfile/sources/src/mat5.c
diff --git a/jni/libsndfile/src/mat5.lo b/jni/libsndfile/sources/src/mat5.lo
similarity index 100%
rename from jni/libsndfile/src/mat5.lo
rename to jni/libsndfile/sources/src/mat5.lo
diff --git a/jni/libsndfile/src/mpc2k.c b/jni/libsndfile/sources/src/mpc2k.c
similarity index 100%
rename from jni/libsndfile/src/mpc2k.c
rename to jni/libsndfile/sources/src/mpc2k.c
diff --git a/jni/libsndfile/src/mpc2k.lo b/jni/libsndfile/sources/src/mpc2k.lo
similarity index 100%
rename from jni/libsndfile/src/mpc2k.lo
rename to jni/libsndfile/sources/src/mpc2k.lo
diff --git a/jni/libsndfile/src/ms_adpcm.c b/jni/libsndfile/sources/src/ms_adpcm.c
similarity index 100%
rename from jni/libsndfile/src/ms_adpcm.c
rename to jni/libsndfile/sources/src/ms_adpcm.c
diff --git a/jni/libsndfile/src/ms_adpcm.lo b/jni/libsndfile/sources/src/ms_adpcm.lo
similarity index 100%
rename from jni/libsndfile/src/ms_adpcm.lo
rename to jni/libsndfile/sources/src/ms_adpcm.lo
diff --git a/jni/libsndfile/src/nist.c b/jni/libsndfile/sources/src/nist.c
similarity index 100%
rename from jni/libsndfile/src/nist.c
rename to jni/libsndfile/sources/src/nist.c
diff --git a/jni/libsndfile/src/nist.lo b/jni/libsndfile/sources/src/nist.lo
similarity index 100%
rename from jni/libsndfile/src/nist.lo
rename to jni/libsndfile/sources/src/nist.lo
diff --git a/jni/libsndfile/src/ogg.c b/jni/libsndfile/sources/src/ogg.c
similarity index 100%
rename from jni/libsndfile/src/ogg.c
rename to jni/libsndfile/sources/src/ogg.c
diff --git a/jni/libsndfile/src/ogg.h b/jni/libsndfile/sources/src/ogg.h
similarity index 100%
rename from jni/libsndfile/src/ogg.h
rename to jni/libsndfile/sources/src/ogg.h
diff --git a/jni/libsndfile/src/ogg.lo b/jni/libsndfile/sources/src/ogg.lo
similarity index 100%
rename from jni/libsndfile/src/ogg.lo
rename to jni/libsndfile/sources/src/ogg.lo
diff --git a/jni/libsndfile/src/ogg_pcm.c b/jni/libsndfile/sources/src/ogg_pcm.c
similarity index 100%
rename from jni/libsndfile/src/ogg_pcm.c
rename to jni/libsndfile/sources/src/ogg_pcm.c
diff --git a/jni/libsndfile/src/ogg_pcm.lo b/jni/libsndfile/sources/src/ogg_pcm.lo
similarity index 100%
rename from jni/libsndfile/src/ogg_pcm.lo
rename to jni/libsndfile/sources/src/ogg_pcm.lo
diff --git a/jni/libsndfile/src/ogg_speex.c b/jni/libsndfile/sources/src/ogg_speex.c
similarity index 100%
rename from jni/libsndfile/src/ogg_speex.c
rename to jni/libsndfile/sources/src/ogg_speex.c
diff --git a/jni/libsndfile/src/ogg_speex.lo b/jni/libsndfile/sources/src/ogg_speex.lo
similarity index 100%
rename from jni/libsndfile/src/ogg_speex.lo
rename to jni/libsndfile/sources/src/ogg_speex.lo
diff --git a/jni/libsndfile/src/ogg_vorbis.c b/jni/libsndfile/sources/src/ogg_vorbis.c
similarity index 100%
rename from jni/libsndfile/src/ogg_vorbis.c
rename to jni/libsndfile/sources/src/ogg_vorbis.c
diff --git a/jni/libsndfile/src/ogg_vorbis.lo b/jni/libsndfile/sources/src/ogg_vorbis.lo
similarity index 100%
rename from jni/libsndfile/src/ogg_vorbis.lo
rename to jni/libsndfile/sources/src/ogg_vorbis.lo
diff --git a/jni/libsndfile/src/paf.c b/jni/libsndfile/sources/src/paf.c
similarity index 100%
rename from jni/libsndfile/src/paf.c
rename to jni/libsndfile/sources/src/paf.c
diff --git a/jni/libsndfile/src/paf.lo b/jni/libsndfile/sources/src/paf.lo
similarity index 100%
rename from jni/libsndfile/src/paf.lo
rename to jni/libsndfile/sources/src/paf.lo
diff --git a/jni/libsndfile/src/pcm.c b/jni/libsndfile/sources/src/pcm.c
similarity index 100%
rename from jni/libsndfile/src/pcm.c
rename to jni/libsndfile/sources/src/pcm.c
diff --git a/jni/libsndfile/src/pcm.lo b/jni/libsndfile/sources/src/pcm.lo
similarity index 100%
rename from jni/libsndfile/src/pcm.lo
rename to jni/libsndfile/sources/src/pcm.lo
diff --git a/jni/libsndfile/src/pvf.c b/jni/libsndfile/sources/src/pvf.c
similarity index 100%
rename from jni/libsndfile/src/pvf.c
rename to jni/libsndfile/sources/src/pvf.c
diff --git a/jni/libsndfile/src/pvf.lo b/jni/libsndfile/sources/src/pvf.lo
similarity index 100%
rename from jni/libsndfile/src/pvf.lo
rename to jni/libsndfile/sources/src/pvf.lo
diff --git a/jni/libsndfile/src/raw.c b/jni/libsndfile/sources/src/raw.c
similarity index 100%
rename from jni/libsndfile/src/raw.c
rename to jni/libsndfile/sources/src/raw.c
diff --git a/jni/libsndfile/src/raw.lo b/jni/libsndfile/sources/src/raw.lo
similarity index 100%
rename from jni/libsndfile/src/raw.lo
rename to jni/libsndfile/sources/src/raw.lo
diff --git a/jni/libsndfile/src/rf64.c b/jni/libsndfile/sources/src/rf64.c
similarity index 100%
rename from jni/libsndfile/src/rf64.c
rename to jni/libsndfile/sources/src/rf64.c
diff --git a/jni/libsndfile/src/rf64.lo b/jni/libsndfile/sources/src/rf64.lo
similarity index 100%
rename from jni/libsndfile/src/rf64.lo
rename to jni/libsndfile/sources/src/rf64.lo
diff --git a/jni/libsndfile/src/rx2.c b/jni/libsndfile/sources/src/rx2.c
similarity index 100%
rename from jni/libsndfile/src/rx2.c
rename to jni/libsndfile/sources/src/rx2.c
diff --git a/jni/libsndfile/src/rx2.lo b/jni/libsndfile/sources/src/rx2.lo
similarity index 100%
rename from jni/libsndfile/src/rx2.lo
rename to jni/libsndfile/sources/src/rx2.lo
diff --git a/jni/libsndfile/src/sd2.c b/jni/libsndfile/sources/src/sd2.c
similarity index 100%
rename from jni/libsndfile/src/sd2.c
rename to jni/libsndfile/sources/src/sd2.c
diff --git a/jni/libsndfile/src/sd2.lo b/jni/libsndfile/sources/src/sd2.lo
similarity index 100%
rename from jni/libsndfile/src/sd2.lo
rename to jni/libsndfile/sources/src/sd2.lo
diff --git a/jni/libsndfile/src/sds.c b/jni/libsndfile/sources/src/sds.c
similarity index 100%
rename from jni/libsndfile/src/sds.c
rename to jni/libsndfile/sources/src/sds.c
diff --git a/jni/libsndfile/src/sds.lo b/jni/libsndfile/sources/src/sds.lo
similarity index 100%
rename from jni/libsndfile/src/sds.lo
rename to jni/libsndfile/sources/src/sds.lo
diff --git a/jni/libsndfile/src/sf_unistd.h b/jni/libsndfile/sources/src/sf_unistd.h
similarity index 100%
rename from jni/libsndfile/src/sf_unistd.h
rename to jni/libsndfile/sources/src/sf_unistd.h
diff --git a/jni/libsndfile/src/sfconfig.h b/jni/libsndfile/sources/src/sfconfig.h
similarity index 100%
rename from jni/libsndfile/src/sfconfig.h
rename to jni/libsndfile/sources/src/sfconfig.h
diff --git a/jni/libsndfile/src/sfendian.h b/jni/libsndfile/sources/src/sfendian.h
similarity index 100%
rename from jni/libsndfile/src/sfendian.h
rename to jni/libsndfile/sources/src/sfendian.h
diff --git a/jni/libsndfile/src/sndfile.c b/jni/libsndfile/sources/src/sndfile.c
similarity index 100%
rename from jni/libsndfile/src/sndfile.c
rename to jni/libsndfile/sources/src/sndfile.c
diff --git a/jni/libsndfile/src/sndfile.h b/jni/libsndfile/sources/src/sndfile.h
similarity index 100%
rename from jni/libsndfile/src/sndfile.h
rename to jni/libsndfile/sources/src/sndfile.h
diff --git a/jni/libsndfile/src/sndfile.h.in b/jni/libsndfile/sources/src/sndfile.h.in
similarity index 100%
rename from jni/libsndfile/src/sndfile.h.in
rename to jni/libsndfile/sources/src/sndfile.h.in
diff --git a/jni/libsndfile/src/sndfile.hh b/jni/libsndfile/sources/src/sndfile.hh
similarity index 100%
rename from jni/libsndfile/src/sndfile.hh
rename to jni/libsndfile/sources/src/sndfile.hh
diff --git a/jni/libsndfile/src/sndfile.lo b/jni/libsndfile/sources/src/sndfile.lo
similarity index 100%
rename from jni/libsndfile/src/sndfile.lo
rename to jni/libsndfile/sources/src/sndfile.lo
diff --git a/jni/libsndfile/src/stamp-h1 b/jni/libsndfile/sources/src/stamp-h1
similarity index 100%
rename from jni/libsndfile/src/stamp-h1
rename to jni/libsndfile/sources/src/stamp-h1
diff --git a/jni/libsndfile/src/strings.c b/jni/libsndfile/sources/src/strings.c
similarity index 100%
rename from jni/libsndfile/src/strings.c
rename to jni/libsndfile/sources/src/strings.c
diff --git a/jni/libsndfile/src/strings.lo b/jni/libsndfile/sources/src/strings.lo
similarity index 100%
rename from jni/libsndfile/src/strings.lo
rename to jni/libsndfile/sources/src/strings.lo
diff --git a/jni/libsndfile/src/svx.c b/jni/libsndfile/sources/src/svx.c
similarity index 100%
rename from jni/libsndfile/src/svx.c
rename to jni/libsndfile/sources/src/svx.c
diff --git a/jni/libsndfile/src/svx.lo b/jni/libsndfile/sources/src/svx.lo
similarity index 100%
rename from jni/libsndfile/src/svx.lo
rename to jni/libsndfile/sources/src/svx.lo
diff --git a/jni/libsndfile/src/test_audio_detect.c b/jni/libsndfile/sources/src/test_audio_detect.c
similarity index 100%
rename from jni/libsndfile/src/test_audio_detect.c
rename to jni/libsndfile/sources/src/test_audio_detect.c
diff --git a/jni/libsndfile/src/test_broadcast_var.c b/jni/libsndfile/sources/src/test_broadcast_var.c
similarity index 100%
rename from jni/libsndfile/src/test_broadcast_var.c
rename to jni/libsndfile/sources/src/test_broadcast_var.c
diff --git a/jni/libsndfile/src/test_conversions.c b/jni/libsndfile/sources/src/test_conversions.c
similarity index 100%
rename from jni/libsndfile/src/test_conversions.c
rename to jni/libsndfile/sources/src/test_conversions.c
diff --git a/jni/libsndfile/src/test_endswap.c b/jni/libsndfile/sources/src/test_endswap.c
similarity index 100%
rename from jni/libsndfile/src/test_endswap.c
rename to jni/libsndfile/sources/src/test_endswap.c
diff --git a/jni/libsndfile/src/test_endswap.def b/jni/libsndfile/sources/src/test_endswap.def
similarity index 100%
rename from jni/libsndfile/src/test_endswap.def
rename to jni/libsndfile/sources/src/test_endswap.def
diff --git a/jni/libsndfile/src/test_endswap.tpl b/jni/libsndfile/sources/src/test_endswap.tpl
similarity index 100%
rename from jni/libsndfile/src/test_endswap.tpl
rename to jni/libsndfile/sources/src/test_endswap.tpl
diff --git a/jni/libsndfile/src/test_file_io.c b/jni/libsndfile/sources/src/test_file_io.c
similarity index 100%
rename from jni/libsndfile/src/test_file_io.c
rename to jni/libsndfile/sources/src/test_file_io.c
diff --git a/jni/libsndfile/src/test_float.c b/jni/libsndfile/sources/src/test_float.c
similarity index 100%
rename from jni/libsndfile/src/test_float.c
rename to jni/libsndfile/sources/src/test_float.c
diff --git a/jni/libsndfile/src/test_ima_oki_adpcm.c b/jni/libsndfile/sources/src/test_ima_oki_adpcm.c
similarity index 100%
rename from jni/libsndfile/src/test_ima_oki_adpcm.c
rename to jni/libsndfile/sources/src/test_ima_oki_adpcm.c
diff --git a/jni/libsndfile/src/test_log_printf.c b/jni/libsndfile/sources/src/test_log_printf.c
similarity index 100%
rename from jni/libsndfile/src/test_log_printf.c
rename to jni/libsndfile/sources/src/test_log_printf.c
diff --git a/jni/libsndfile/src/test_main.c b/jni/libsndfile/sources/src/test_main.c
similarity index 100%
rename from jni/libsndfile/src/test_main.c
rename to jni/libsndfile/sources/src/test_main.c
diff --git a/jni/libsndfile/src/test_main.h b/jni/libsndfile/sources/src/test_main.h
similarity index 100%
rename from jni/libsndfile/src/test_main.h
rename to jni/libsndfile/sources/src/test_main.h
diff --git a/jni/libsndfile/src/test_strncpy_crlf.c b/jni/libsndfile/sources/src/test_strncpy_crlf.c
similarity index 100%
rename from jni/libsndfile/src/test_strncpy_crlf.c
rename to jni/libsndfile/sources/src/test_strncpy_crlf.c
diff --git a/jni/libsndfile/src/txw.c b/jni/libsndfile/sources/src/txw.c
similarity index 100%
rename from jni/libsndfile/src/txw.c
rename to jni/libsndfile/sources/src/txw.c
diff --git a/jni/libsndfile/src/txw.lo b/jni/libsndfile/sources/src/txw.lo
similarity index 100%
rename from jni/libsndfile/src/txw.lo
rename to jni/libsndfile/sources/src/txw.lo
diff --git a/jni/libsndfile/src/ulaw.c b/jni/libsndfile/sources/src/ulaw.c
similarity index 100%
rename from jni/libsndfile/src/ulaw.c
rename to jni/libsndfile/sources/src/ulaw.c
diff --git a/jni/libsndfile/src/ulaw.lo b/jni/libsndfile/sources/src/ulaw.lo
similarity index 100%
rename from jni/libsndfile/src/ulaw.lo
rename to jni/libsndfile/sources/src/ulaw.lo
diff --git a/jni/libsndfile/src/version-metadata.rc b/jni/libsndfile/sources/src/version-metadata.rc
similarity index 100%
rename from jni/libsndfile/src/version-metadata.rc
rename to jni/libsndfile/sources/src/version-metadata.rc
diff --git a/jni/libsndfile/src/version-metadata.rc.in b/jni/libsndfile/sources/src/version-metadata.rc.in
similarity index 100%
rename from jni/libsndfile/src/version-metadata.rc.in
rename to jni/libsndfile/sources/src/version-metadata.rc.in
diff --git a/jni/libsndfile/src/voc.c b/jni/libsndfile/sources/src/voc.c
similarity index 100%
rename from jni/libsndfile/src/voc.c
rename to jni/libsndfile/sources/src/voc.c
diff --git a/jni/libsndfile/src/voc.lo b/jni/libsndfile/sources/src/voc.lo
similarity index 100%
rename from jni/libsndfile/src/voc.lo
rename to jni/libsndfile/sources/src/voc.lo
diff --git a/jni/libsndfile/src/vox_adpcm.c b/jni/libsndfile/sources/src/vox_adpcm.c
similarity index 100%
rename from jni/libsndfile/src/vox_adpcm.c
rename to jni/libsndfile/sources/src/vox_adpcm.c
diff --git a/jni/libsndfile/src/vox_adpcm.lo b/jni/libsndfile/sources/src/vox_adpcm.lo
similarity index 100%
rename from jni/libsndfile/src/vox_adpcm.lo
rename to jni/libsndfile/sources/src/vox_adpcm.lo
diff --git a/jni/libsndfile/src/w64.c b/jni/libsndfile/sources/src/w64.c
similarity index 100%
rename from jni/libsndfile/src/w64.c
rename to jni/libsndfile/sources/src/w64.c
diff --git a/jni/libsndfile/src/w64.lo b/jni/libsndfile/sources/src/w64.lo
similarity index 100%
rename from jni/libsndfile/src/w64.lo
rename to jni/libsndfile/sources/src/w64.lo
diff --git a/jni/libsndfile/src/wav.c b/jni/libsndfile/sources/src/wav.c
similarity index 100%
rename from jni/libsndfile/src/wav.c
rename to jni/libsndfile/sources/src/wav.c
diff --git a/jni/libsndfile/src/wav.lo b/jni/libsndfile/sources/src/wav.lo
similarity index 100%
rename from jni/libsndfile/src/wav.lo
rename to jni/libsndfile/sources/src/wav.lo
diff --git a/jni/libsndfile/src/wav_w64.c b/jni/libsndfile/sources/src/wav_w64.c
similarity index 100%
rename from jni/libsndfile/src/wav_w64.c
rename to jni/libsndfile/sources/src/wav_w64.c
diff --git a/jni/libsndfile/src/wav_w64.h b/jni/libsndfile/sources/src/wav_w64.h
similarity index 100%
rename from jni/libsndfile/src/wav_w64.h
rename to jni/libsndfile/sources/src/wav_w64.h
diff --git a/jni/libsndfile/src/wav_w64.lo b/jni/libsndfile/sources/src/wav_w64.lo
similarity index 100%
rename from jni/libsndfile/src/wav_w64.lo
rename to jni/libsndfile/sources/src/wav_w64.lo
diff --git a/jni/libsndfile/src/windows.c b/jni/libsndfile/sources/src/windows.c
similarity index 100%
rename from jni/libsndfile/src/windows.c
rename to jni/libsndfile/sources/src/windows.c
diff --git a/jni/libsndfile/src/windows.lo b/jni/libsndfile/sources/src/windows.lo
similarity index 100%
rename from jni/libsndfile/src/windows.lo
rename to jni/libsndfile/sources/src/windows.lo
diff --git a/jni/libsndfile/src/wve.c b/jni/libsndfile/sources/src/wve.c
similarity index 100%
rename from jni/libsndfile/src/wve.c
rename to jni/libsndfile/sources/src/wve.c
diff --git a/jni/libsndfile/src/wve.lo b/jni/libsndfile/sources/src/wve.lo
similarity index 100%
rename from jni/libsndfile/src/wve.lo
rename to jni/libsndfile/sources/src/wve.lo
diff --git a/jni/libsndfile/src/xi.c b/jni/libsndfile/sources/src/xi.c
similarity index 100%
rename from jni/libsndfile/src/xi.c
rename to jni/libsndfile/sources/src/xi.c
diff --git a/jni/libsndfile/src/xi.lo b/jni/libsndfile/sources/src/xi.lo
similarity index 100%
rename from jni/libsndfile/src/xi.lo
rename to jni/libsndfile/sources/src/xi.lo
diff --git a/jni/libsndfile/tests/.deps/aiff_rw_test.Po b/jni/libsndfile/sources/tests/.deps/aiff_rw_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/aiff_rw_test.Po
rename to jni/libsndfile/sources/tests/.deps/aiff_rw_test.Po
diff --git a/jni/libsndfile/tests/.deps/alaw_test.Po b/jni/libsndfile/sources/tests/.deps/alaw_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/alaw_test.Po
rename to jni/libsndfile/sources/tests/.deps/alaw_test.Po
diff --git a/jni/libsndfile/tests/.deps/benchmark.Po b/jni/libsndfile/sources/tests/.deps/benchmark.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/benchmark.Po
rename to jni/libsndfile/sources/tests/.deps/benchmark.Po
diff --git a/jni/libsndfile/tests/.deps/checksum_test.Po b/jni/libsndfile/sources/tests/.deps/checksum_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/checksum_test.Po
rename to jni/libsndfile/sources/tests/.deps/checksum_test.Po
diff --git a/jni/libsndfile/tests/.deps/command_test.Po b/jni/libsndfile/sources/tests/.deps/command_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/command_test.Po
rename to jni/libsndfile/sources/tests/.deps/command_test.Po
diff --git a/jni/libsndfile/tests/.deps/cpp_test.Po b/jni/libsndfile/sources/tests/.deps/cpp_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/cpp_test.Po
rename to jni/libsndfile/sources/tests/.deps/cpp_test.Po
diff --git a/jni/libsndfile/tests/.deps/dft_cmp.Po b/jni/libsndfile/sources/tests/.deps/dft_cmp.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/dft_cmp.Po
rename to jni/libsndfile/sources/tests/.deps/dft_cmp.Po
diff --git a/jni/libsndfile/tests/.deps/dither_test.Po b/jni/libsndfile/sources/tests/.deps/dither_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/dither_test.Po
rename to jni/libsndfile/sources/tests/.deps/dither_test.Po
diff --git a/jni/libsndfile/tests/.deps/dwvw_test.Po b/jni/libsndfile/sources/tests/.deps/dwvw_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/dwvw_test.Po
rename to jni/libsndfile/sources/tests/.deps/dwvw_test.Po
diff --git a/jni/libsndfile/tests/.deps/error_test.Po b/jni/libsndfile/sources/tests/.deps/error_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/error_test.Po
rename to jni/libsndfile/sources/tests/.deps/error_test.Po
diff --git a/jni/libsndfile/tests/.deps/external_libs_test.Po b/jni/libsndfile/sources/tests/.deps/external_libs_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/external_libs_test.Po
rename to jni/libsndfile/sources/tests/.deps/external_libs_test.Po
diff --git a/jni/libsndfile/tests/.deps/fix_this.Po b/jni/libsndfile/sources/tests/.deps/fix_this.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/fix_this.Po
rename to jni/libsndfile/sources/tests/.deps/fix_this.Po
diff --git a/jni/libsndfile/tests/.deps/floating_point_test.Po b/jni/libsndfile/sources/tests/.deps/floating_point_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/floating_point_test.Po
rename to jni/libsndfile/sources/tests/.deps/floating_point_test.Po
diff --git a/jni/libsndfile/tests/.deps/format_check_test.Po b/jni/libsndfile/sources/tests/.deps/format_check_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/format_check_test.Po
rename to jni/libsndfile/sources/tests/.deps/format_check_test.Po
diff --git a/jni/libsndfile/tests/.deps/generate.Po b/jni/libsndfile/sources/tests/.deps/generate.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/generate.Po
rename to jni/libsndfile/sources/tests/.deps/generate.Po
diff --git a/jni/libsndfile/tests/.deps/header_test.Po b/jni/libsndfile/sources/tests/.deps/header_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/header_test.Po
rename to jni/libsndfile/sources/tests/.deps/header_test.Po
diff --git a/jni/libsndfile/tests/.deps/headerless_test.Po b/jni/libsndfile/sources/tests/.deps/headerless_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/headerless_test.Po
rename to jni/libsndfile/sources/tests/.deps/headerless_test.Po
diff --git a/jni/libsndfile/tests/.deps/largefile_test.Po b/jni/libsndfile/sources/tests/.deps/largefile_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/largefile_test.Po
rename to jni/libsndfile/sources/tests/.deps/largefile_test.Po
diff --git a/jni/libsndfile/tests/.deps/locale_test.Po b/jni/libsndfile/sources/tests/.deps/locale_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/locale_test.Po
rename to jni/libsndfile/sources/tests/.deps/locale_test.Po
diff --git a/jni/libsndfile/tests/.deps/lossy_comp_test.Po b/jni/libsndfile/sources/tests/.deps/lossy_comp_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/lossy_comp_test.Po
rename to jni/libsndfile/sources/tests/.deps/lossy_comp_test.Po
diff --git a/jni/libsndfile/tests/.deps/misc_test.Po b/jni/libsndfile/sources/tests/.deps/misc_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/misc_test.Po
rename to jni/libsndfile/sources/tests/.deps/misc_test.Po
diff --git a/jni/libsndfile/tests/.deps/multi_file_test.Po b/jni/libsndfile/sources/tests/.deps/multi_file_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/multi_file_test.Po
rename to jni/libsndfile/sources/tests/.deps/multi_file_test.Po
diff --git a/jni/libsndfile/tests/.deps/ogg_test.Po b/jni/libsndfile/sources/tests/.deps/ogg_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/ogg_test.Po
rename to jni/libsndfile/sources/tests/.deps/ogg_test.Po
diff --git a/jni/libsndfile/tests/.deps/pcm_test.Po b/jni/libsndfile/sources/tests/.deps/pcm_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/pcm_test.Po
rename to jni/libsndfile/sources/tests/.deps/pcm_test.Po
diff --git a/jni/libsndfile/tests/.deps/peak_chunk_test.Po b/jni/libsndfile/sources/tests/.deps/peak_chunk_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/peak_chunk_test.Po
rename to jni/libsndfile/sources/tests/.deps/peak_chunk_test.Po
diff --git a/jni/libsndfile/tests/.deps/pipe_test.Po b/jni/libsndfile/sources/tests/.deps/pipe_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/pipe_test.Po
rename to jni/libsndfile/sources/tests/.deps/pipe_test.Po
diff --git a/jni/libsndfile/tests/.deps/raw_test.Po b/jni/libsndfile/sources/tests/.deps/raw_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/raw_test.Po
rename to jni/libsndfile/sources/tests/.deps/raw_test.Po
diff --git a/jni/libsndfile/tests/.deps/rdwr_test.Po b/jni/libsndfile/sources/tests/.deps/rdwr_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/rdwr_test.Po
rename to jni/libsndfile/sources/tests/.deps/rdwr_test.Po
diff --git a/jni/libsndfile/tests/.deps/scale_clip_test.Po b/jni/libsndfile/sources/tests/.deps/scale_clip_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/scale_clip_test.Po
rename to jni/libsndfile/sources/tests/.deps/scale_clip_test.Po
diff --git a/jni/libsndfile/tests/.deps/sfversion.Po b/jni/libsndfile/sources/tests/.deps/sfversion.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/sfversion.Po
rename to jni/libsndfile/sources/tests/.deps/sfversion.Po
diff --git a/jni/libsndfile/tests/.deps/stdin_test.Po b/jni/libsndfile/sources/tests/.deps/stdin_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/stdin_test.Po
rename to jni/libsndfile/sources/tests/.deps/stdin_test.Po
diff --git a/jni/libsndfile/tests/.deps/stdio_test.Po b/jni/libsndfile/sources/tests/.deps/stdio_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/stdio_test.Po
rename to jni/libsndfile/sources/tests/.deps/stdio_test.Po
diff --git a/jni/libsndfile/tests/.deps/stdout_test.Po b/jni/libsndfile/sources/tests/.deps/stdout_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/stdout_test.Po
rename to jni/libsndfile/sources/tests/.deps/stdout_test.Po
diff --git a/jni/libsndfile/tests/.deps/string_test.Po b/jni/libsndfile/sources/tests/.deps/string_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/string_test.Po
rename to jni/libsndfile/sources/tests/.deps/string_test.Po
diff --git a/jni/libsndfile/tests/.deps/ulaw_test.Po b/jni/libsndfile/sources/tests/.deps/ulaw_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/ulaw_test.Po
rename to jni/libsndfile/sources/tests/.deps/ulaw_test.Po
diff --git a/jni/libsndfile/tests/.deps/utils.Po b/jni/libsndfile/sources/tests/.deps/utils.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/utils.Po
rename to jni/libsndfile/sources/tests/.deps/utils.Po
diff --git a/jni/libsndfile/tests/.deps/virtual_io_test.Po b/jni/libsndfile/sources/tests/.deps/virtual_io_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/virtual_io_test.Po
rename to jni/libsndfile/sources/tests/.deps/virtual_io_test.Po
diff --git a/jni/libsndfile/tests/.deps/vorbis_test.Po b/jni/libsndfile/sources/tests/.deps/vorbis_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/vorbis_test.Po
rename to jni/libsndfile/sources/tests/.deps/vorbis_test.Po
diff --git a/jni/libsndfile/tests/.deps/win32_ordinal_test.Po b/jni/libsndfile/sources/tests/.deps/win32_ordinal_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/win32_ordinal_test.Po
rename to jni/libsndfile/sources/tests/.deps/win32_ordinal_test.Po
diff --git a/jni/libsndfile/tests/.deps/win32_test.Po b/jni/libsndfile/sources/tests/.deps/win32_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/win32_test.Po
rename to jni/libsndfile/sources/tests/.deps/win32_test.Po
diff --git a/jni/libsndfile/tests/.deps/write_read_test.Po b/jni/libsndfile/sources/tests/.deps/write_read_test.Po
similarity index 100%
rename from jni/libsndfile/tests/.deps/write_read_test.Po
rename to jni/libsndfile/sources/tests/.deps/write_read_test.Po
diff --git a/jni/libsndfile/tests/Makefile b/jni/libsndfile/sources/tests/Makefile
similarity index 100%
rename from jni/libsndfile/tests/Makefile
rename to jni/libsndfile/sources/tests/Makefile
diff --git a/jni/libsndfile/tests/Makefile.am b/jni/libsndfile/sources/tests/Makefile.am
similarity index 100%
rename from jni/libsndfile/tests/Makefile.am
rename to jni/libsndfile/sources/tests/Makefile.am
diff --git a/jni/libsndfile/tests/Makefile.in b/jni/libsndfile/sources/tests/Makefile.in
similarity index 100%
rename from jni/libsndfile/tests/Makefile.in
rename to jni/libsndfile/sources/tests/Makefile.in
diff --git a/jni/libsndfile/tests/aiff_rw_test.c b/jni/libsndfile/sources/tests/aiff_rw_test.c
similarity index 100%
rename from jni/libsndfile/tests/aiff_rw_test.c
rename to jni/libsndfile/sources/tests/aiff_rw_test.c
diff --git a/jni/libsndfile/tests/alaw_test.c b/jni/libsndfile/sources/tests/alaw_test.c
similarity index 100%
rename from jni/libsndfile/tests/alaw_test.c
rename to jni/libsndfile/sources/tests/alaw_test.c
diff --git a/jni/libsndfile/tests/benchmark.c b/jni/libsndfile/sources/tests/benchmark.c
similarity index 100%
rename from jni/libsndfile/tests/benchmark.c
rename to jni/libsndfile/sources/tests/benchmark.c
diff --git a/jni/libsndfile/tests/benchmark.def b/jni/libsndfile/sources/tests/benchmark.def
similarity index 100%
rename from jni/libsndfile/tests/benchmark.def
rename to jni/libsndfile/sources/tests/benchmark.def
diff --git a/jni/libsndfile/tests/benchmark.tpl b/jni/libsndfile/sources/tests/benchmark.tpl
similarity index 100%
rename from jni/libsndfile/tests/benchmark.tpl
rename to jni/libsndfile/sources/tests/benchmark.tpl
diff --git a/jni/libsndfile/tests/checksum_test.c b/jni/libsndfile/sources/tests/checksum_test.c
similarity index 100%
rename from jni/libsndfile/tests/checksum_test.c
rename to jni/libsndfile/sources/tests/checksum_test.c
diff --git a/jni/libsndfile/tests/command_test.c b/jni/libsndfile/sources/tests/command_test.c
similarity index 100%
rename from jni/libsndfile/tests/command_test.c
rename to jni/libsndfile/sources/tests/command_test.c
diff --git a/jni/libsndfile/tests/cpp_test.cc b/jni/libsndfile/sources/tests/cpp_test.cc
similarity index 100%
rename from jni/libsndfile/tests/cpp_test.cc
rename to jni/libsndfile/sources/tests/cpp_test.cc
diff --git a/jni/libsndfile/tests/dft_cmp.c b/jni/libsndfile/sources/tests/dft_cmp.c
similarity index 100%
rename from jni/libsndfile/tests/dft_cmp.c
rename to jni/libsndfile/sources/tests/dft_cmp.c
diff --git a/jni/libsndfile/tests/dft_cmp.h b/jni/libsndfile/sources/tests/dft_cmp.h
similarity index 100%
rename from jni/libsndfile/tests/dft_cmp.h
rename to jni/libsndfile/sources/tests/dft_cmp.h
diff --git a/jni/libsndfile/tests/dither_test.c b/jni/libsndfile/sources/tests/dither_test.c
similarity index 100%
rename from jni/libsndfile/tests/dither_test.c
rename to jni/libsndfile/sources/tests/dither_test.c
diff --git a/jni/libsndfile/tests/dwvw_test.c b/jni/libsndfile/sources/tests/dwvw_test.c
similarity index 100%
rename from jni/libsndfile/tests/dwvw_test.c
rename to jni/libsndfile/sources/tests/dwvw_test.c
diff --git a/jni/libsndfile/tests/error_test.c b/jni/libsndfile/sources/tests/error_test.c
similarity index 100%
rename from jni/libsndfile/tests/error_test.c
rename to jni/libsndfile/sources/tests/error_test.c
diff --git a/jni/libsndfile/tests/external_libs_test.c b/jni/libsndfile/sources/tests/external_libs_test.c
similarity index 100%
rename from jni/libsndfile/tests/external_libs_test.c
rename to jni/libsndfile/sources/tests/external_libs_test.c
diff --git a/jni/libsndfile/tests/fix_this.c b/jni/libsndfile/sources/tests/fix_this.c
similarity index 100%
rename from jni/libsndfile/tests/fix_this.c
rename to jni/libsndfile/sources/tests/fix_this.c
diff --git a/jni/libsndfile/tests/floating_point_test.c b/jni/libsndfile/sources/tests/floating_point_test.c
similarity index 100%
rename from jni/libsndfile/tests/floating_point_test.c
rename to jni/libsndfile/sources/tests/floating_point_test.c
diff --git a/jni/libsndfile/tests/floating_point_test.def b/jni/libsndfile/sources/tests/floating_point_test.def
similarity index 100%
rename from jni/libsndfile/tests/floating_point_test.def
rename to jni/libsndfile/sources/tests/floating_point_test.def
diff --git a/jni/libsndfile/tests/floating_point_test.tpl b/jni/libsndfile/sources/tests/floating_point_test.tpl
similarity index 100%
rename from jni/libsndfile/tests/floating_point_test.tpl
rename to jni/libsndfile/sources/tests/floating_point_test.tpl
diff --git a/jni/libsndfile/tests/format_check_test.c b/jni/libsndfile/sources/tests/format_check_test.c
similarity index 100%
rename from jni/libsndfile/tests/format_check_test.c
rename to jni/libsndfile/sources/tests/format_check_test.c
diff --git a/jni/libsndfile/tests/generate.c b/jni/libsndfile/sources/tests/generate.c
similarity index 100%
rename from jni/libsndfile/tests/generate.c
rename to jni/libsndfile/sources/tests/generate.c
diff --git a/jni/libsndfile/tests/generate.h b/jni/libsndfile/sources/tests/generate.h
similarity index 100%
rename from jni/libsndfile/tests/generate.h
rename to jni/libsndfile/sources/tests/generate.h
diff --git a/jni/libsndfile/tests/header_test.c b/jni/libsndfile/sources/tests/header_test.c
similarity index 100%
rename from jni/libsndfile/tests/header_test.c
rename to jni/libsndfile/sources/tests/header_test.c
diff --git a/jni/libsndfile/tests/header_test.def b/jni/libsndfile/sources/tests/header_test.def
similarity index 100%
rename from jni/libsndfile/tests/header_test.def
rename to jni/libsndfile/sources/tests/header_test.def
diff --git a/jni/libsndfile/tests/header_test.tpl b/jni/libsndfile/sources/tests/header_test.tpl
similarity index 100%
rename from jni/libsndfile/tests/header_test.tpl
rename to jni/libsndfile/sources/tests/header_test.tpl
diff --git a/jni/libsndfile/tests/headerless_test.c b/jni/libsndfile/sources/tests/headerless_test.c
similarity index 100%
rename from jni/libsndfile/tests/headerless_test.c
rename to jni/libsndfile/sources/tests/headerless_test.c
diff --git a/jni/libsndfile/tests/largefile_test.c b/jni/libsndfile/sources/tests/largefile_test.c
similarity index 100%
rename from jni/libsndfile/tests/largefile_test.c
rename to jni/libsndfile/sources/tests/largefile_test.c
diff --git a/jni/libsndfile/tests/locale_test.c b/jni/libsndfile/sources/tests/locale_test.c
similarity index 100%
rename from jni/libsndfile/tests/locale_test.c
rename to jni/libsndfile/sources/tests/locale_test.c
diff --git a/jni/libsndfile/tests/lossy_comp_test.c b/jni/libsndfile/sources/tests/lossy_comp_test.c
similarity index 100%
rename from jni/libsndfile/tests/lossy_comp_test.c
rename to jni/libsndfile/sources/tests/lossy_comp_test.c
diff --git a/jni/libsndfile/tests/misc_test.c b/jni/libsndfile/sources/tests/misc_test.c
similarity index 100%
rename from jni/libsndfile/tests/misc_test.c
rename to jni/libsndfile/sources/tests/misc_test.c
diff --git a/jni/libsndfile/tests/multi_file_test.c b/jni/libsndfile/sources/tests/multi_file_test.c
similarity index 100%
rename from jni/libsndfile/tests/multi_file_test.c
rename to jni/libsndfile/sources/tests/multi_file_test.c
diff --git a/jni/libsndfile/tests/ogg_test.c b/jni/libsndfile/sources/tests/ogg_test.c
similarity index 100%
rename from jni/libsndfile/tests/ogg_test.c
rename to jni/libsndfile/sources/tests/ogg_test.c
diff --git a/jni/libsndfile/tests/pcm_test.c b/jni/libsndfile/sources/tests/pcm_test.c
similarity index 100%
rename from jni/libsndfile/tests/pcm_test.c
rename to jni/libsndfile/sources/tests/pcm_test.c
diff --git a/jni/libsndfile/tests/pcm_test.def b/jni/libsndfile/sources/tests/pcm_test.def
similarity index 100%
rename from jni/libsndfile/tests/pcm_test.def
rename to jni/libsndfile/sources/tests/pcm_test.def
diff --git a/jni/libsndfile/tests/pcm_test.tpl b/jni/libsndfile/sources/tests/pcm_test.tpl
similarity index 100%
rename from jni/libsndfile/tests/pcm_test.tpl
rename to jni/libsndfile/sources/tests/pcm_test.tpl
diff --git a/jni/libsndfile/tests/peak_chunk_test.c b/jni/libsndfile/sources/tests/peak_chunk_test.c
similarity index 100%
rename from jni/libsndfile/tests/peak_chunk_test.c
rename to jni/libsndfile/sources/tests/peak_chunk_test.c
diff --git a/jni/libsndfile/tests/pedantic-header-test.sh b/jni/libsndfile/sources/tests/pedantic-header-test.sh
similarity index 100%
rename from jni/libsndfile/tests/pedantic-header-test.sh
rename to jni/libsndfile/sources/tests/pedantic-header-test.sh
diff --git a/jni/libsndfile/tests/pedantic-header-test.sh.in b/jni/libsndfile/sources/tests/pedantic-header-test.sh.in
similarity index 100%
rename from jni/libsndfile/tests/pedantic-header-test.sh.in
rename to jni/libsndfile/sources/tests/pedantic-header-test.sh.in
diff --git a/jni/libsndfile/tests/pipe_test.c b/jni/libsndfile/sources/tests/pipe_test.c
similarity index 100%
rename from jni/libsndfile/tests/pipe_test.c
rename to jni/libsndfile/sources/tests/pipe_test.c
diff --git a/jni/libsndfile/tests/pipe_test.def b/jni/libsndfile/sources/tests/pipe_test.def
similarity index 100%
rename from jni/libsndfile/tests/pipe_test.def
rename to jni/libsndfile/sources/tests/pipe_test.def
diff --git a/jni/libsndfile/tests/pipe_test.tpl b/jni/libsndfile/sources/tests/pipe_test.tpl
similarity index 100%
rename from jni/libsndfile/tests/pipe_test.tpl
rename to jni/libsndfile/sources/tests/pipe_test.tpl
diff --git a/jni/libsndfile/tests/raw_test.c b/jni/libsndfile/sources/tests/raw_test.c
similarity index 100%
rename from jni/libsndfile/tests/raw_test.c
rename to jni/libsndfile/sources/tests/raw_test.c
diff --git a/jni/libsndfile/tests/rdwr_test.c b/jni/libsndfile/sources/tests/rdwr_test.c
similarity index 100%
rename from jni/libsndfile/tests/rdwr_test.c
rename to jni/libsndfile/sources/tests/rdwr_test.c
diff --git a/jni/libsndfile/tests/rdwr_test.def b/jni/libsndfile/sources/tests/rdwr_test.def
similarity index 100%
rename from jni/libsndfile/tests/rdwr_test.def
rename to jni/libsndfile/sources/tests/rdwr_test.def
diff --git a/jni/libsndfile/tests/rdwr_test.tpl b/jni/libsndfile/sources/tests/rdwr_test.tpl
similarity index 100%
rename from jni/libsndfile/tests/rdwr_test.tpl
rename to jni/libsndfile/sources/tests/rdwr_test.tpl
diff --git a/jni/libsndfile/tests/scale_clip_test.c b/jni/libsndfile/sources/tests/scale_clip_test.c
similarity index 100%
rename from jni/libsndfile/tests/scale_clip_test.c
rename to jni/libsndfile/sources/tests/scale_clip_test.c
diff --git a/jni/libsndfile/tests/scale_clip_test.def b/jni/libsndfile/sources/tests/scale_clip_test.def
similarity index 100%
rename from jni/libsndfile/tests/scale_clip_test.def
rename to jni/libsndfile/sources/tests/scale_clip_test.def
diff --git a/jni/libsndfile/tests/scale_clip_test.tpl b/jni/libsndfile/sources/tests/scale_clip_test.tpl
similarity index 100%
rename from jni/libsndfile/tests/scale_clip_test.tpl
rename to jni/libsndfile/sources/tests/scale_clip_test.tpl
diff --git a/jni/libsndfile/tests/sfversion.c b/jni/libsndfile/sources/tests/sfversion.c
similarity index 100%
rename from jni/libsndfile/tests/sfversion.c
rename to jni/libsndfile/sources/tests/sfversion.c
diff --git a/jni/libsndfile/tests/stdin_test.c b/jni/libsndfile/sources/tests/stdin_test.c
similarity index 100%
rename from jni/libsndfile/tests/stdin_test.c
rename to jni/libsndfile/sources/tests/stdin_test.c
diff --git a/jni/libsndfile/tests/stdio_test.c b/jni/libsndfile/sources/tests/stdio_test.c
similarity index 100%
rename from jni/libsndfile/tests/stdio_test.c
rename to jni/libsndfile/sources/tests/stdio_test.c
diff --git a/jni/libsndfile/tests/stdout_test.c b/jni/libsndfile/sources/tests/stdout_test.c
similarity index 100%
rename from jni/libsndfile/tests/stdout_test.c
rename to jni/libsndfile/sources/tests/stdout_test.c
diff --git a/jni/libsndfile/tests/string_test.c b/jni/libsndfile/sources/tests/string_test.c
similarity index 100%
rename from jni/libsndfile/tests/string_test.c
rename to jni/libsndfile/sources/tests/string_test.c
diff --git a/jni/libsndfile/tests/test_wrapper.sh b/jni/libsndfile/sources/tests/test_wrapper.sh
similarity index 100%
rename from jni/libsndfile/tests/test_wrapper.sh
rename to jni/libsndfile/sources/tests/test_wrapper.sh
diff --git a/jni/libsndfile/tests/test_wrapper.sh.in b/jni/libsndfile/sources/tests/test_wrapper.sh.in
similarity index 100%
rename from jni/libsndfile/tests/test_wrapper.sh.in
rename to jni/libsndfile/sources/tests/test_wrapper.sh.in
diff --git a/jni/libsndfile/tests/ulaw_test.c b/jni/libsndfile/sources/tests/ulaw_test.c
similarity index 100%
rename from jni/libsndfile/tests/ulaw_test.c
rename to jni/libsndfile/sources/tests/ulaw_test.c
diff --git a/jni/libsndfile/tests/utils.c b/jni/libsndfile/sources/tests/utils.c
similarity index 100%
rename from jni/libsndfile/tests/utils.c
rename to jni/libsndfile/sources/tests/utils.c
diff --git a/jni/libsndfile/tests/utils.def b/jni/libsndfile/sources/tests/utils.def
similarity index 100%
rename from jni/libsndfile/tests/utils.def
rename to jni/libsndfile/sources/tests/utils.def
diff --git a/jni/libsndfile/tests/utils.h b/jni/libsndfile/sources/tests/utils.h
similarity index 100%
rename from jni/libsndfile/tests/utils.h
rename to jni/libsndfile/sources/tests/utils.h
diff --git a/jni/libsndfile/tests/utils.tpl b/jni/libsndfile/sources/tests/utils.tpl
similarity index 100%
rename from jni/libsndfile/tests/utils.tpl
rename to jni/libsndfile/sources/tests/utils.tpl
diff --git a/jni/libsndfile/tests/virtual_io_test.c b/jni/libsndfile/sources/tests/virtual_io_test.c
similarity index 100%
rename from jni/libsndfile/tests/virtual_io_test.c
rename to jni/libsndfile/sources/tests/virtual_io_test.c
diff --git a/jni/libsndfile/tests/vorbis_test.c b/jni/libsndfile/sources/tests/vorbis_test.c
similarity index 100%
rename from jni/libsndfile/tests/vorbis_test.c
rename to jni/libsndfile/sources/tests/vorbis_test.c
diff --git a/jni/libsndfile/tests/win32_ordinal_test.c b/jni/libsndfile/sources/tests/win32_ordinal_test.c
similarity index 100%
rename from jni/libsndfile/tests/win32_ordinal_test.c
rename to jni/libsndfile/sources/tests/win32_ordinal_test.c
diff --git a/jni/libsndfile/tests/win32_test.c b/jni/libsndfile/sources/tests/win32_test.c
similarity index 100%
rename from jni/libsndfile/tests/win32_test.c
rename to jni/libsndfile/sources/tests/win32_test.c
diff --git a/jni/libsndfile/tests/write_read_test.c b/jni/libsndfile/sources/tests/write_read_test.c
similarity index 100%
rename from jni/libsndfile/tests/write_read_test.c
rename to jni/libsndfile/sources/tests/write_read_test.c
diff --git a/jni/libsndfile/tests/write_read_test.def b/jni/libsndfile/sources/tests/write_read_test.def
similarity index 100%
rename from jni/libsndfile/tests/write_read_test.def
rename to jni/libsndfile/sources/tests/write_read_test.def
diff --git a/jni/libsndfile/tests/write_read_test.tpl b/jni/libsndfile/sources/tests/write_read_test.tpl
similarity index 100%
rename from jni/libsndfile/tests/write_read_test.tpl
rename to jni/libsndfile/sources/tests/write_read_test.tpl
diff --git a/jni/libspeex/Android.mk b/jni/libspeex/Android.mk
new file mode 100644
index 0000000..dc4f16b
--- /dev/null
+++ b/jni/libspeex/Android.mk
@@ -0,0 +1,100 @@
+#
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include $(CLEAR_VARS)
+
+MY_SPEEX := libspeex/sources
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_SRC_FILES := \
+	$(MY_SPEEX)/libspeex/mdf.c \
+	$(MY_SPEEX)/libspeex/preprocess.c \
+	$(MY_SPEEX)/libspeex/filterbank.c \
+	$(MY_SPEEX)/libspeex/fftwrap.c \
+	$(MY_SPEEX)/libspeex/smallft.c \
+	$(MY_SPEEX)/libspeex/bits.c \
+	$(MY_SPEEX)/libspeex/buffer.c \
+	$(MY_SPEEX)/libspeex/cb_search.c \
+	$(MY_SPEEX)/libspeex/exc_10_16_table.c \
+	$(MY_SPEEX)/libspeex/exc_10_32_table.c \
+	$(MY_SPEEX)/libspeex/exc_20_32_table.c \
+	$(MY_SPEEX)/libspeex/exc_5_256_table.c \
+	$(MY_SPEEX)/libspeex/exc_5_64_table.c \
+	$(MY_SPEEX)/libspeex/exc_8_128_table.c \
+	$(MY_SPEEX)/libspeex/filters.c \
+	$(MY_SPEEX)/libspeex/gain_table.c \
+	$(MY_SPEEX)/libspeex/gain_table_lbr.c \
+	$(MY_SPEEX)/libspeex/modes.c \
+	$(MY_SPEEX)/libspeex/modes_wb.c \
+	$(MY_SPEEX)/libspeex/speex.c \
+	$(MY_SPEEX)/libspeex/hexc_10_32_table.c \
+	$(MY_SPEEX)/libspeex/hexc_table.c \
+	$(MY_SPEEX)/libspeex/high_lsp_tables.c \
+	$(MY_SPEEX)/libspeex/jitter.c \
+	$(MY_SPEEX)/libspeex/kiss_fft.c \
+	$(MY_SPEEX)/libspeex/kiss_fftr.c \
+	$(MY_SPEEX)/libspeex/lpc.c \
+	$(MY_SPEEX)/libspeex/lsp.c \
+	$(MY_SPEEX)/libspeex/lsp_tables_nb.c \
+	$(MY_SPEEX)/libspeex/ltp.c \
+	$(MY_SPEEX)/libspeex/nb_celp.c \
+	$(MY_SPEEX)/libspeex/quant_lsp.c \
+	$(MY_SPEEX)/libspeex/sb_celp.c \
+	$(MY_SPEEX)/libspeex/scal.c \
+	$(MY_SPEEX)/libspeex/speex_callbacks.c \
+	$(MY_SPEEX)/libspeex/speex_header.c \
+	$(MY_SPEEX)/libspeex/stereo.c \
+	$(MY_SPEEX)/libspeex/vbr.c \
+	$(MY_SPEEX)/libspeex/vq.c \
+	$(MY_SPEEX)/libspeex/window.c \
+
+
+LOCAL_MODULE:= libspeex
+
+LOCAL_CFLAGS+= -DEXPORT= -DFLOATING_POINT -DUSE_SMALLFT -DVAR_ARRAYS
+LOCAL_CFLAGS+= -O3 -fstrict-aliasing -fprefetch-loop-arrays 
+
+LOCAL_C_INCLUDES += $(MY_SPEEX)/include
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+
+############# speexresampler #################
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_SRC_FILES :=	$(MY_SPEEX)/libspeex/resample.c
+
+LOCAL_MODULE:= libspeexresampler
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_CFLAGS += -DEXPORT= -DFIXED_POINT -DRESAMPLE_FORCE_FULL_SINC_TABLE
+LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
+
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+LOCAL_CFLAGS += -D_USE_NEON
+endif
+
+LOCAL_C_INCLUDES += $(MY_SPEEX)/include
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+
diff --git a/jni/libspeex/AUTHORS b/jni/libspeex/sources/AUTHORS
similarity index 100%
rename from jni/libspeex/AUTHORS
rename to jni/libspeex/sources/AUTHORS
diff --git a/jni/libspeex/COPYING b/jni/libspeex/sources/COPYING
similarity index 100%
rename from jni/libspeex/COPYING
rename to jni/libspeex/sources/COPYING
diff --git a/jni/libspeex/CleanSpec.mk b/jni/libspeex/sources/CleanSpec.mk
similarity index 100%
rename from jni/libspeex/CleanSpec.mk
rename to jni/libspeex/sources/CleanSpec.mk
diff --git a/jni/libspeex/MODULE_LICENSE_BSD_LIKE b/jni/libspeex/sources/MODULE_LICENSE_BSD_LIKE
similarity index 100%
rename from jni/libspeex/MODULE_LICENSE_BSD_LIKE
rename to jni/libspeex/sources/MODULE_LICENSE_BSD_LIKE
diff --git a/jni/libspeex/NOTICE b/jni/libspeex/sources/NOTICE
similarity index 100%
rename from jni/libspeex/NOTICE
rename to jni/libspeex/sources/NOTICE
diff --git a/jni/libspeex/README.android b/jni/libspeex/sources/README.android
similarity index 100%
rename from jni/libspeex/README.android
rename to jni/libspeex/sources/README.android
diff --git a/jni/libspeex/ThirdPartyProject.prop b/jni/libspeex/sources/ThirdPartyProject.prop
similarity index 100%
rename from jni/libspeex/ThirdPartyProject.prop
rename to jni/libspeex/sources/ThirdPartyProject.prop
diff --git a/jni/libspeex/include/speex/speex.h b/jni/libspeex/sources/include/speex/speex.h
similarity index 100%
rename from jni/libspeex/include/speex/speex.h
rename to jni/libspeex/sources/include/speex/speex.h
diff --git a/jni/libspeex/include/speex/speex_bits.h b/jni/libspeex/sources/include/speex/speex_bits.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_bits.h
rename to jni/libspeex/sources/include/speex/speex_bits.h
diff --git a/jni/libspeex/include/speex/speex_buffer.h b/jni/libspeex/sources/include/speex/speex_buffer.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_buffer.h
rename to jni/libspeex/sources/include/speex/speex_buffer.h
diff --git a/jni/libspeex/include/speex/speex_callbacks.h b/jni/libspeex/sources/include/speex/speex_callbacks.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_callbacks.h
rename to jni/libspeex/sources/include/speex/speex_callbacks.h
diff --git a/jni/libspeex/include/speex/speex_config_types.h b/jni/libspeex/sources/include/speex/speex_config_types.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_config_types.h
rename to jni/libspeex/sources/include/speex/speex_config_types.h
diff --git a/jni/libspeex/include/speex/speex_echo.h b/jni/libspeex/sources/include/speex/speex_echo.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_echo.h
rename to jni/libspeex/sources/include/speex/speex_echo.h
diff --git a/jni/libspeex/include/speex/speex_header.h b/jni/libspeex/sources/include/speex/speex_header.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_header.h
rename to jni/libspeex/sources/include/speex/speex_header.h
diff --git a/jni/libspeex/include/speex/speex_jitter.h b/jni/libspeex/sources/include/speex/speex_jitter.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_jitter.h
rename to jni/libspeex/sources/include/speex/speex_jitter.h
diff --git a/jni/libspeex/include/speex/speex_preprocess.h b/jni/libspeex/sources/include/speex/speex_preprocess.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_preprocess.h
rename to jni/libspeex/sources/include/speex/speex_preprocess.h
diff --git a/jni/libspeex/include/speex/speex_resampler.h b/jni/libspeex/sources/include/speex/speex_resampler.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_resampler.h
rename to jni/libspeex/sources/include/speex/speex_resampler.h
diff --git a/jni/libspeex/include/speex/speex_stereo.h b/jni/libspeex/sources/include/speex/speex_stereo.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_stereo.h
rename to jni/libspeex/sources/include/speex/speex_stereo.h
diff --git a/jni/libspeex/include/speex/speex_types.h b/jni/libspeex/sources/include/speex/speex_types.h
similarity index 100%
rename from jni/libspeex/include/speex/speex_types.h
rename to jni/libspeex/sources/include/speex/speex_types.h
diff --git a/jni/libspeex/libspeex/_kiss_fft_guts.h b/jni/libspeex/sources/libspeex/_kiss_fft_guts.h
similarity index 100%
rename from jni/libspeex/libspeex/_kiss_fft_guts.h
rename to jni/libspeex/sources/libspeex/_kiss_fft_guts.h
diff --git a/jni/libspeex/libspeex/arch.h b/jni/libspeex/sources/libspeex/arch.h
similarity index 100%
rename from jni/libspeex/libspeex/arch.h
rename to jni/libspeex/sources/libspeex/arch.h
diff --git a/jni/libspeex/libspeex/bits.c b/jni/libspeex/sources/libspeex/bits.c
similarity index 100%
rename from jni/libspeex/libspeex/bits.c
rename to jni/libspeex/sources/libspeex/bits.c
diff --git a/jni/libspeex/libspeex/buffer.c b/jni/libspeex/sources/libspeex/buffer.c
similarity index 100%
rename from jni/libspeex/libspeex/buffer.c
rename to jni/libspeex/sources/libspeex/buffer.c
diff --git a/jni/libspeex/libspeex/cb_search.c b/jni/libspeex/sources/libspeex/cb_search.c
similarity index 100%
rename from jni/libspeex/libspeex/cb_search.c
rename to jni/libspeex/sources/libspeex/cb_search.c
diff --git a/jni/libspeex/libspeex/cb_search.h b/jni/libspeex/sources/libspeex/cb_search.h
similarity index 100%
rename from jni/libspeex/libspeex/cb_search.h
rename to jni/libspeex/sources/libspeex/cb_search.h
diff --git a/jni/libspeex/libspeex/cb_search_arm4.h b/jni/libspeex/sources/libspeex/cb_search_arm4.h
similarity index 100%
rename from jni/libspeex/libspeex/cb_search_arm4.h
rename to jni/libspeex/sources/libspeex/cb_search_arm4.h
diff --git a/jni/libspeex/libspeex/cb_search_bfin.h b/jni/libspeex/sources/libspeex/cb_search_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/cb_search_bfin.h
rename to jni/libspeex/sources/libspeex/cb_search_bfin.h
diff --git a/jni/libspeex/libspeex/cb_search_sse.h b/jni/libspeex/sources/libspeex/cb_search_sse.h
similarity index 100%
rename from jni/libspeex/libspeex/cb_search_sse.h
rename to jni/libspeex/sources/libspeex/cb_search_sse.h
diff --git a/jni/libspeex/libspeex/exc_10_16_table.c b/jni/libspeex/sources/libspeex/exc_10_16_table.c
similarity index 100%
rename from jni/libspeex/libspeex/exc_10_16_table.c
rename to jni/libspeex/sources/libspeex/exc_10_16_table.c
diff --git a/jni/libspeex/libspeex/exc_10_32_table.c b/jni/libspeex/sources/libspeex/exc_10_32_table.c
similarity index 100%
rename from jni/libspeex/libspeex/exc_10_32_table.c
rename to jni/libspeex/sources/libspeex/exc_10_32_table.c
diff --git a/jni/libspeex/libspeex/exc_20_32_table.c b/jni/libspeex/sources/libspeex/exc_20_32_table.c
similarity index 100%
rename from jni/libspeex/libspeex/exc_20_32_table.c
rename to jni/libspeex/sources/libspeex/exc_20_32_table.c
diff --git a/jni/libspeex/libspeex/exc_5_256_table.c b/jni/libspeex/sources/libspeex/exc_5_256_table.c
similarity index 100%
rename from jni/libspeex/libspeex/exc_5_256_table.c
rename to jni/libspeex/sources/libspeex/exc_5_256_table.c
diff --git a/jni/libspeex/libspeex/exc_5_64_table.c b/jni/libspeex/sources/libspeex/exc_5_64_table.c
similarity index 100%
rename from jni/libspeex/libspeex/exc_5_64_table.c
rename to jni/libspeex/sources/libspeex/exc_5_64_table.c
diff --git a/jni/libspeex/libspeex/exc_8_128_table.c b/jni/libspeex/sources/libspeex/exc_8_128_table.c
similarity index 100%
rename from jni/libspeex/libspeex/exc_8_128_table.c
rename to jni/libspeex/sources/libspeex/exc_8_128_table.c
diff --git a/jni/libspeex/libspeex/fftwrap.c b/jni/libspeex/sources/libspeex/fftwrap.c
similarity index 100%
rename from jni/libspeex/libspeex/fftwrap.c
rename to jni/libspeex/sources/libspeex/fftwrap.c
diff --git a/jni/libspeex/libspeex/fftwrap.h b/jni/libspeex/sources/libspeex/fftwrap.h
similarity index 100%
rename from jni/libspeex/libspeex/fftwrap.h
rename to jni/libspeex/sources/libspeex/fftwrap.h
diff --git a/jni/libspeex/libspeex/filterbank.c b/jni/libspeex/sources/libspeex/filterbank.c
similarity index 100%
rename from jni/libspeex/libspeex/filterbank.c
rename to jni/libspeex/sources/libspeex/filterbank.c
diff --git a/jni/libspeex/libspeex/filterbank.h b/jni/libspeex/sources/libspeex/filterbank.h
similarity index 100%
rename from jni/libspeex/libspeex/filterbank.h
rename to jni/libspeex/sources/libspeex/filterbank.h
diff --git a/jni/libspeex/libspeex/filters.c b/jni/libspeex/sources/libspeex/filters.c
similarity index 100%
rename from jni/libspeex/libspeex/filters.c
rename to jni/libspeex/sources/libspeex/filters.c
diff --git a/jni/libspeex/libspeex/filters.h b/jni/libspeex/sources/libspeex/filters.h
similarity index 100%
rename from jni/libspeex/libspeex/filters.h
rename to jni/libspeex/sources/libspeex/filters.h
diff --git a/jni/libspeex/libspeex/filters_arm4.h b/jni/libspeex/sources/libspeex/filters_arm4.h
similarity index 100%
rename from jni/libspeex/libspeex/filters_arm4.h
rename to jni/libspeex/sources/libspeex/filters_arm4.h
diff --git a/jni/libspeex/libspeex/filters_bfin.h b/jni/libspeex/sources/libspeex/filters_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/filters_bfin.h
rename to jni/libspeex/sources/libspeex/filters_bfin.h
diff --git a/jni/libspeex/libspeex/filters_sse.h b/jni/libspeex/sources/libspeex/filters_sse.h
similarity index 100%
rename from jni/libspeex/libspeex/filters_sse.h
rename to jni/libspeex/sources/libspeex/filters_sse.h
diff --git a/jni/libspeex/libspeex/fixed_arm4.h b/jni/libspeex/sources/libspeex/fixed_arm4.h
similarity index 100%
rename from jni/libspeex/libspeex/fixed_arm4.h
rename to jni/libspeex/sources/libspeex/fixed_arm4.h
diff --git a/jni/libspeex/libspeex/fixed_arm5e.h b/jni/libspeex/sources/libspeex/fixed_arm5e.h
similarity index 100%
rename from jni/libspeex/libspeex/fixed_arm5e.h
rename to jni/libspeex/sources/libspeex/fixed_arm5e.h
diff --git a/jni/libspeex/libspeex/fixed_bfin.h b/jni/libspeex/sources/libspeex/fixed_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/fixed_bfin.h
rename to jni/libspeex/sources/libspeex/fixed_bfin.h
diff --git a/jni/libspeex/libspeex/fixed_debug.h b/jni/libspeex/sources/libspeex/fixed_debug.h
similarity index 100%
rename from jni/libspeex/libspeex/fixed_debug.h
rename to jni/libspeex/sources/libspeex/fixed_debug.h
diff --git a/jni/libspeex/libspeex/fixed_generic.h b/jni/libspeex/sources/libspeex/fixed_generic.h
similarity index 100%
rename from jni/libspeex/libspeex/fixed_generic.h
rename to jni/libspeex/sources/libspeex/fixed_generic.h
diff --git a/jni/libspeex/libspeex/gain_table.c b/jni/libspeex/sources/libspeex/gain_table.c
similarity index 100%
rename from jni/libspeex/libspeex/gain_table.c
rename to jni/libspeex/sources/libspeex/gain_table.c
diff --git a/jni/libspeex/libspeex/gain_table_lbr.c b/jni/libspeex/sources/libspeex/gain_table_lbr.c
similarity index 100%
rename from jni/libspeex/libspeex/gain_table_lbr.c
rename to jni/libspeex/sources/libspeex/gain_table_lbr.c
diff --git a/jni/libspeex/libspeex/hexc_10_32_table.c b/jni/libspeex/sources/libspeex/hexc_10_32_table.c
similarity index 100%
rename from jni/libspeex/libspeex/hexc_10_32_table.c
rename to jni/libspeex/sources/libspeex/hexc_10_32_table.c
diff --git a/jni/libspeex/libspeex/hexc_table.c b/jni/libspeex/sources/libspeex/hexc_table.c
similarity index 100%
rename from jni/libspeex/libspeex/hexc_table.c
rename to jni/libspeex/sources/libspeex/hexc_table.c
diff --git a/jni/libspeex/libspeex/high_lsp_tables.c b/jni/libspeex/sources/libspeex/high_lsp_tables.c
similarity index 100%
rename from jni/libspeex/libspeex/high_lsp_tables.c
rename to jni/libspeex/sources/libspeex/high_lsp_tables.c
diff --git a/jni/libspeex/libspeex/jitter.c b/jni/libspeex/sources/libspeex/jitter.c
similarity index 100%
rename from jni/libspeex/libspeex/jitter.c
rename to jni/libspeex/sources/libspeex/jitter.c
diff --git a/jni/libspeex/libspeex/kiss_fft.c b/jni/libspeex/sources/libspeex/kiss_fft.c
similarity index 100%
rename from jni/libspeex/libspeex/kiss_fft.c
rename to jni/libspeex/sources/libspeex/kiss_fft.c
diff --git a/jni/libspeex/libspeex/kiss_fft.h b/jni/libspeex/sources/libspeex/kiss_fft.h
similarity index 100%
rename from jni/libspeex/libspeex/kiss_fft.h
rename to jni/libspeex/sources/libspeex/kiss_fft.h
diff --git a/jni/libspeex/libspeex/kiss_fftr.c b/jni/libspeex/sources/libspeex/kiss_fftr.c
similarity index 100%
rename from jni/libspeex/libspeex/kiss_fftr.c
rename to jni/libspeex/sources/libspeex/kiss_fftr.c
diff --git a/jni/libspeex/libspeex/kiss_fftr.h b/jni/libspeex/sources/libspeex/kiss_fftr.h
similarity index 100%
rename from jni/libspeex/libspeex/kiss_fftr.h
rename to jni/libspeex/sources/libspeex/kiss_fftr.h
diff --git a/jni/libspeex/libspeex/lpc.c b/jni/libspeex/sources/libspeex/lpc.c
similarity index 100%
rename from jni/libspeex/libspeex/lpc.c
rename to jni/libspeex/sources/libspeex/lpc.c
diff --git a/jni/libspeex/libspeex/lpc.h b/jni/libspeex/sources/libspeex/lpc.h
similarity index 100%
rename from jni/libspeex/libspeex/lpc.h
rename to jni/libspeex/sources/libspeex/lpc.h
diff --git a/jni/libspeex/libspeex/lpc_bfin.h b/jni/libspeex/sources/libspeex/lpc_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/lpc_bfin.h
rename to jni/libspeex/sources/libspeex/lpc_bfin.h
diff --git a/jni/libspeex/libspeex/lsp.c b/jni/libspeex/sources/libspeex/lsp.c
similarity index 100%
rename from jni/libspeex/libspeex/lsp.c
rename to jni/libspeex/sources/libspeex/lsp.c
diff --git a/jni/libspeex/libspeex/lsp.h b/jni/libspeex/sources/libspeex/lsp.h
similarity index 100%
rename from jni/libspeex/libspeex/lsp.h
rename to jni/libspeex/sources/libspeex/lsp.h
diff --git a/jni/libspeex/libspeex/lsp_bfin.h b/jni/libspeex/sources/libspeex/lsp_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/lsp_bfin.h
rename to jni/libspeex/sources/libspeex/lsp_bfin.h
diff --git a/jni/libspeex/libspeex/lsp_tables_nb.c b/jni/libspeex/sources/libspeex/lsp_tables_nb.c
similarity index 100%
rename from jni/libspeex/libspeex/lsp_tables_nb.c
rename to jni/libspeex/sources/libspeex/lsp_tables_nb.c
diff --git a/jni/libspeex/libspeex/ltp.c b/jni/libspeex/sources/libspeex/ltp.c
similarity index 100%
rename from jni/libspeex/libspeex/ltp.c
rename to jni/libspeex/sources/libspeex/ltp.c
diff --git a/jni/libspeex/libspeex/ltp.h b/jni/libspeex/sources/libspeex/ltp.h
similarity index 100%
rename from jni/libspeex/libspeex/ltp.h
rename to jni/libspeex/sources/libspeex/ltp.h
diff --git a/jni/libspeex/libspeex/ltp_arm4.h b/jni/libspeex/sources/libspeex/ltp_arm4.h
similarity index 100%
rename from jni/libspeex/libspeex/ltp_arm4.h
rename to jni/libspeex/sources/libspeex/ltp_arm4.h
diff --git a/jni/libspeex/libspeex/ltp_bfin.h b/jni/libspeex/sources/libspeex/ltp_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/ltp_bfin.h
rename to jni/libspeex/sources/libspeex/ltp_bfin.h
diff --git a/jni/libspeex/libspeex/ltp_sse.h b/jni/libspeex/sources/libspeex/ltp_sse.h
similarity index 100%
rename from jni/libspeex/libspeex/ltp_sse.h
rename to jni/libspeex/sources/libspeex/ltp_sse.h
diff --git a/jni/libspeex/libspeex/math_approx.h b/jni/libspeex/sources/libspeex/math_approx.h
similarity index 100%
rename from jni/libspeex/libspeex/math_approx.h
rename to jni/libspeex/sources/libspeex/math_approx.h
diff --git a/jni/libspeex/libspeex/mdf.c b/jni/libspeex/sources/libspeex/mdf.c
similarity index 100%
rename from jni/libspeex/libspeex/mdf.c
rename to jni/libspeex/sources/libspeex/mdf.c
diff --git a/jni/libspeex/libspeex/misc_bfin.h b/jni/libspeex/sources/libspeex/misc_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/misc_bfin.h
rename to jni/libspeex/sources/libspeex/misc_bfin.h
diff --git a/jni/libspeex/libspeex/modes.c b/jni/libspeex/sources/libspeex/modes.c
similarity index 100%
rename from jni/libspeex/libspeex/modes.c
rename to jni/libspeex/sources/libspeex/modes.c
diff --git a/jni/libspeex/libspeex/modes.h b/jni/libspeex/sources/libspeex/modes.h
similarity index 100%
rename from jni/libspeex/libspeex/modes.h
rename to jni/libspeex/sources/libspeex/modes.h
diff --git a/jni/libspeex/libspeex/modes_wb.c b/jni/libspeex/sources/libspeex/modes_wb.c
similarity index 100%
rename from jni/libspeex/libspeex/modes_wb.c
rename to jni/libspeex/sources/libspeex/modes_wb.c
diff --git a/jni/libspeex/libspeex/nb_celp.c b/jni/libspeex/sources/libspeex/nb_celp.c
similarity index 100%
rename from jni/libspeex/libspeex/nb_celp.c
rename to jni/libspeex/sources/libspeex/nb_celp.c
diff --git a/jni/libspeex/libspeex/nb_celp.h b/jni/libspeex/sources/libspeex/nb_celp.h
similarity index 100%
rename from jni/libspeex/libspeex/nb_celp.h
rename to jni/libspeex/sources/libspeex/nb_celp.h
diff --git a/jni/libspeex/libspeex/os_support.h b/jni/libspeex/sources/libspeex/os_support.h
similarity index 100%
rename from jni/libspeex/libspeex/os_support.h
rename to jni/libspeex/sources/libspeex/os_support.h
diff --git a/jni/libspeex/libspeex/preprocess.c b/jni/libspeex/sources/libspeex/preprocess.c
similarity index 100%
rename from jni/libspeex/libspeex/preprocess.c
rename to jni/libspeex/sources/libspeex/preprocess.c
diff --git a/jni/libspeex/libspeex/pseudofloat.h b/jni/libspeex/sources/libspeex/pseudofloat.h
similarity index 100%
rename from jni/libspeex/libspeex/pseudofloat.h
rename to jni/libspeex/sources/libspeex/pseudofloat.h
diff --git a/jni/libspeex/libspeex/quant_lsp.c b/jni/libspeex/sources/libspeex/quant_lsp.c
similarity index 100%
rename from jni/libspeex/libspeex/quant_lsp.c
rename to jni/libspeex/sources/libspeex/quant_lsp.c
diff --git a/jni/libspeex/libspeex/quant_lsp.h b/jni/libspeex/sources/libspeex/quant_lsp.h
similarity index 100%
rename from jni/libspeex/libspeex/quant_lsp.h
rename to jni/libspeex/sources/libspeex/quant_lsp.h
diff --git a/jni/libspeex/libspeex/quant_lsp_bfin.h b/jni/libspeex/sources/libspeex/quant_lsp_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/quant_lsp_bfin.h
rename to jni/libspeex/sources/libspeex/quant_lsp_bfin.h
diff --git a/jni/libspeex/libspeex/resample.c b/jni/libspeex/sources/libspeex/resample.c
similarity index 100%
rename from jni/libspeex/libspeex/resample.c
rename to jni/libspeex/sources/libspeex/resample.c
diff --git a/jni/libspeex/libspeex/resample_neon.h b/jni/libspeex/sources/libspeex/resample_neon.h
similarity index 100%
rename from jni/libspeex/libspeex/resample_neon.h
rename to jni/libspeex/sources/libspeex/resample_neon.h
diff --git a/jni/libspeex/libspeex/resample_sse.h b/jni/libspeex/sources/libspeex/resample_sse.h
similarity index 100%
rename from jni/libspeex/libspeex/resample_sse.h
rename to jni/libspeex/sources/libspeex/resample_sse.h
diff --git a/jni/libspeex/libspeex/sb_celp.c b/jni/libspeex/sources/libspeex/sb_celp.c
similarity index 100%
rename from jni/libspeex/libspeex/sb_celp.c
rename to jni/libspeex/sources/libspeex/sb_celp.c
diff --git a/jni/libspeex/libspeex/sb_celp.h b/jni/libspeex/sources/libspeex/sb_celp.h
similarity index 100%
rename from jni/libspeex/libspeex/sb_celp.h
rename to jni/libspeex/sources/libspeex/sb_celp.h
diff --git a/jni/libspeex/libspeex/scal.c b/jni/libspeex/sources/libspeex/scal.c
similarity index 100%
rename from jni/libspeex/libspeex/scal.c
rename to jni/libspeex/sources/libspeex/scal.c
diff --git a/jni/libspeex/libspeex/smallft.c b/jni/libspeex/sources/libspeex/smallft.c
similarity index 100%
rename from jni/libspeex/libspeex/smallft.c
rename to jni/libspeex/sources/libspeex/smallft.c
diff --git a/jni/libspeex/libspeex/smallft.h b/jni/libspeex/sources/libspeex/smallft.h
similarity index 100%
rename from jni/libspeex/libspeex/smallft.h
rename to jni/libspeex/sources/libspeex/smallft.h
diff --git a/jni/libspeex/libspeex/speex.c b/jni/libspeex/sources/libspeex/speex.c
similarity index 100%
rename from jni/libspeex/libspeex/speex.c
rename to jni/libspeex/sources/libspeex/speex.c
diff --git a/jni/libspeex/libspeex/speex_callbacks.c b/jni/libspeex/sources/libspeex/speex_callbacks.c
similarity index 100%
rename from jni/libspeex/libspeex/speex_callbacks.c
rename to jni/libspeex/sources/libspeex/speex_callbacks.c
diff --git a/jni/libspeex/libspeex/speex_header.c b/jni/libspeex/sources/libspeex/speex_header.c
similarity index 100%
rename from jni/libspeex/libspeex/speex_header.c
rename to jni/libspeex/sources/libspeex/speex_header.c
diff --git a/jni/libspeex/libspeex/stack_alloc.h b/jni/libspeex/sources/libspeex/stack_alloc.h
similarity index 100%
rename from jni/libspeex/libspeex/stack_alloc.h
rename to jni/libspeex/sources/libspeex/stack_alloc.h
diff --git a/jni/libspeex/libspeex/stereo.c b/jni/libspeex/sources/libspeex/stereo.c
similarity index 100%
rename from jni/libspeex/libspeex/stereo.c
rename to jni/libspeex/sources/libspeex/stereo.c
diff --git a/jni/libspeex/libspeex/vbr.c b/jni/libspeex/sources/libspeex/vbr.c
similarity index 100%
rename from jni/libspeex/libspeex/vbr.c
rename to jni/libspeex/sources/libspeex/vbr.c
diff --git a/jni/libspeex/libspeex/vbr.h b/jni/libspeex/sources/libspeex/vbr.h
similarity index 100%
rename from jni/libspeex/libspeex/vbr.h
rename to jni/libspeex/sources/libspeex/vbr.h
diff --git a/jni/libspeex/libspeex/vorbis_psy.h b/jni/libspeex/sources/libspeex/vorbis_psy.h
similarity index 100%
rename from jni/libspeex/libspeex/vorbis_psy.h
rename to jni/libspeex/sources/libspeex/vorbis_psy.h
diff --git a/jni/libspeex/libspeex/vq.c b/jni/libspeex/sources/libspeex/vq.c
similarity index 100%
rename from jni/libspeex/libspeex/vq.c
rename to jni/libspeex/sources/libspeex/vq.c
diff --git a/jni/libspeex/libspeex/vq.h b/jni/libspeex/sources/libspeex/vq.h
similarity index 100%
rename from jni/libspeex/libspeex/vq.h
rename to jni/libspeex/sources/libspeex/vq.h
diff --git a/jni/libspeex/libspeex/vq_arm4.h b/jni/libspeex/sources/libspeex/vq_arm4.h
similarity index 100%
rename from jni/libspeex/libspeex/vq_arm4.h
rename to jni/libspeex/sources/libspeex/vq_arm4.h
diff --git a/jni/libspeex/libspeex/vq_bfin.h b/jni/libspeex/sources/libspeex/vq_bfin.h
similarity index 100%
rename from jni/libspeex/libspeex/vq_bfin.h
rename to jni/libspeex/sources/libspeex/vq_bfin.h
diff --git a/jni/libspeex/libspeex/vq_sse.h b/jni/libspeex/sources/libspeex/vq_sse.h
similarity index 100%
rename from jni/libspeex/libspeex/vq_sse.h
rename to jni/libspeex/sources/libspeex/vq_sse.h
diff --git a/jni/libspeex/libspeex/window.c b/jni/libspeex/sources/libspeex/window.c
similarity index 100%
rename from jni/libspeex/libspeex/window.c
rename to jni/libspeex/sources/libspeex/window.c
diff --git a/jni/libyaml/Android.mk b/jni/libyaml/Android.mk
index b579a58..fd0abb3 100644
--- a/jni/libyaml/Android.mk
+++ b/jni/libyaml/Android.mk
@@ -1,17 +1,27 @@
 # libyaml/jni/Android.mk
 
-LOCAL_PATH := $(call my-dir)
-
 include $(CLEAR_VARS)
 
+MY_LIBYAML := libyaml/sources
+
 LOCAL_CFLAGS := -DYAML_VERSION_STRING=\"0.1.4\" \
 				-DYAML_VERSION_MAJOR=0 \
 				-DYAML_VERSION_MINOR=1 \
 				-DYAML_VERSION_PATCH=4
+
 LOCAL_MODULE     := libyaml
+
 LOCAL_LDLIBS     := -L$(SYSROOT)/usr/lib
-LOCAL_SRC_FILES  := api.c reader.c scanner.c \
-                    parser.c loader.c writer.c emitter.c dumper.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc
+
+LOCAL_SRC_FILES  := $(MY_LIBYAML)/api.c \
+					$(MY_LIBYAML)/reader.c \
+					$(MY_LIBYAML)/scanner.c \
+					$(MY_LIBYAML)/parser.c \
+					$(MY_LIBYAML)/loader.c \
+					$(MY_LIBYAML)/writer.c \
+					$(MY_LIBYAML)/emitter.c \
+					$(MY_LIBYAML)/dumper.c
+
+LOCAL_C_INCLUDES += $(MY_LIBYAML)/inc
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/libyaml/Makefile.am b/jni/libyaml/sources/Makefile.am
similarity index 100%
rename from jni/libyaml/Makefile.am
rename to jni/libyaml/sources/Makefile.am
diff --git a/jni/libyaml/Makefile.in b/jni/libyaml/sources/Makefile.in
similarity index 100%
rename from jni/libyaml/Makefile.in
rename to jni/libyaml/sources/Makefile.in
diff --git a/jni/libyaml/api.c b/jni/libyaml/sources/api.c
similarity index 100%
rename from jni/libyaml/api.c
rename to jni/libyaml/sources/api.c
diff --git a/jni/libyaml/dumper.c b/jni/libyaml/sources/dumper.c
similarity index 100%
rename from jni/libyaml/dumper.c
rename to jni/libyaml/sources/dumper.c
diff --git a/jni/libyaml/emitter.c b/jni/libyaml/sources/emitter.c
similarity index 100%
rename from jni/libyaml/emitter.c
rename to jni/libyaml/sources/emitter.c
diff --git a/jni/libyaml/inc/yaml.h b/jni/libyaml/sources/inc/yaml.h
similarity index 100%
rename from jni/libyaml/inc/yaml.h
rename to jni/libyaml/sources/inc/yaml.h
diff --git a/jni/libyaml/loader.c b/jni/libyaml/sources/loader.c
similarity index 100%
rename from jni/libyaml/loader.c
rename to jni/libyaml/sources/loader.c
diff --git a/jni/libyaml/parser.c b/jni/libyaml/sources/parser.c
similarity index 100%
rename from jni/libyaml/parser.c
rename to jni/libyaml/sources/parser.c
diff --git a/jni/libyaml/reader.c b/jni/libyaml/sources/reader.c
similarity index 100%
rename from jni/libyaml/reader.c
rename to jni/libyaml/sources/reader.c
diff --git a/jni/libyaml/scanner.c b/jni/libyaml/sources/scanner.c
similarity index 100%
rename from jni/libyaml/scanner.c
rename to jni/libyaml/sources/scanner.c
diff --git a/jni/libyaml/writer.c b/jni/libyaml/sources/writer.c
similarity index 100%
rename from jni/libyaml/writer.c
rename to jni/libyaml/sources/writer.c
diff --git a/jni/libyaml/yaml_private.h b/jni/libyaml/sources/yaml_private.h
similarity index 100%
rename from jni/libyaml/yaml_private.h
rename to jni/libyaml/sources/yaml_private.h
diff --git a/jni/libzrtp/Android.mk b/jni/libzrtp/Android.mk
new file mode 100644
index 0000000..0d42614
--- /dev/null
+++ b/jni/libzrtp/Android.mk
@@ -0,0 +1,56 @@
+#
+# Define and build the zrtpcpp static lib
+#
+include $(CLEAR_VARS)
+
+MY_LIBZRTPCPP = libzrtp
+
+LOCAL_MODULE := libzrtpcpp
+LOCAL_CPP_FEATURES := exceptions
+#
+# set to false if testing/compiling new modules to catch undefined symbols (if build shared lib without TIVI_ENV)
+# LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
+
+# include paths for zrtpcpp modules
+LOCAL_C_INCLUDES += $(MY_LIBZRTPCPP) \
+					$(MY_LIBZRTPCPP)/srtp \
+					$(MY_LIBZRTPCPP)/src \
+					/ucommon/inc/ \
+					$(APP_PROJECT_PATH)/jni/ucommon/inc \
+					$(MY_LIBZRTPCPP)/src/libzrtpcpp \
+					$(MY_OPENSSL)/include \
+
+LOCAL_SRC_FILES += \
+					$(MY_LIBZRTPCPP)/src/ZrtpCallbackWrapper.cpp \
+					$(MY_LIBZRTPCPP)/src/Zrtp.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpCrc32.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketCommit.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketConf2Ack.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketConfirm.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketDHPart.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketGoClear.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketClearAck.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketHelloAck.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketHello.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketError.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketErrorAck.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketPingAck.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketPing.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketSASrelay.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpPacketRelayAck.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpStateClass.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpTextData.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpConfigure.cpp \
+					$(MY_LIBZRTPCPP)/src/ZrtpCWrapper.cpp \
+					$(MY_LIBZRTPCPP)/src/Base32.cpp \
+					$(MY_LIBZRTPCPP)/srtp/CryptoContext.cpp \
+					$(MY_LIBZRTPCPP)/srtp/CryptoContextCtrl.cpp \
+					$(MY_LIBZRTPCPP)/srtp/crypto/openssl/hmac.cpp \
+					$(MY_LIBZRTPCPP)/srtp/crypto/openssl/SrtpSymCrypto.cpp \
+					$(MY_LIBZRTPCPP)/srtp/crypto/skein_block.c \
+					$(MY_LIBZRTPCPP)/srtp/crypto/macSkein.cpp \
+					$(MY_LIBZRTPCPP)/srtp/crypto/skein.c \
+
+
+include $(BUILD_STATIC_LIBRARY)
+
diff --git a/jni/libzrtp/AUTHORS b/jni/libzrtp/sources/AUTHORS
similarity index 100%
rename from jni/libzrtp/AUTHORS
rename to jni/libzrtp/sources/AUTHORS
diff --git a/jni/libzrtp/CMakeLists.txt b/jni/libzrtp/sources/CMakeLists.txt
similarity index 100%
rename from jni/libzrtp/CMakeLists.txt
rename to jni/libzrtp/sources/CMakeLists.txt
diff --git a/jni/libzrtp/COPYING b/jni/libzrtp/sources/COPYING
similarity index 100%
rename from jni/libzrtp/COPYING
rename to jni/libzrtp/sources/COPYING
diff --git a/jni/libzrtp/ChangeLog b/jni/libzrtp/sources/ChangeLog
similarity index 100%
rename from jni/libzrtp/ChangeLog
rename to jni/libzrtp/sources/ChangeLog
diff --git a/jni/libzrtp/INSTALL b/jni/libzrtp/sources/INSTALL
similarity index 100%
rename from jni/libzrtp/INSTALL
rename to jni/libzrtp/sources/INSTALL
diff --git a/jni/libzrtp/NEWS b/jni/libzrtp/sources/NEWS
similarity index 100%
rename from jni/libzrtp/NEWS
rename to jni/libzrtp/sources/NEWS
diff --git a/jni/libzrtp/README.md b/jni/libzrtp/sources/README.md
similarity index 100%
rename from jni/libzrtp/README.md
rename to jni/libzrtp/sources/README.md
diff --git a/jni/libzrtp/cmake/Modules/AutoArgs.cmake b/jni/libzrtp/sources/cmake/Modules/AutoArgs.cmake
similarity index 100%
rename from jni/libzrtp/cmake/Modules/AutoArgs.cmake
rename to jni/libzrtp/sources/cmake/Modules/AutoArgs.cmake
diff --git a/jni/libzrtp/cmake/Modules/FindGcryptConfig.cmake b/jni/libzrtp/sources/cmake/Modules/FindGcryptConfig.cmake
similarity index 100%
rename from jni/libzrtp/cmake/Modules/FindGcryptConfig.cmake
rename to jni/libzrtp/sources/cmake/Modules/FindGcryptConfig.cmake
diff --git a/jni/libzrtp/cmake/Modules/GeneratePackage.cmake b/jni/libzrtp/sources/cmake/Modules/GeneratePackage.cmake
similarity index 100%
rename from jni/libzrtp/cmake/Modules/GeneratePackage.cmake
rename to jni/libzrtp/sources/cmake/Modules/GeneratePackage.cmake
diff --git a/jni/libzrtp/cmake/Modules/LibFindMacros.cmake b/jni/libzrtp/sources/cmake/Modules/LibFindMacros.cmake
similarity index 100%
rename from jni/libzrtp/cmake/Modules/LibFindMacros.cmake
rename to jni/libzrtp/sources/cmake/Modules/LibFindMacros.cmake
diff --git a/jni/libzrtp/cmake/Modules/SourceDistribution.cmake b/jni/libzrtp/sources/cmake/Modules/SourceDistribution.cmake
similarity index 100%
rename from jni/libzrtp/cmake/Modules/SourceDistribution.cmake
rename to jni/libzrtp/sources/cmake/Modules/SourceDistribution.cmake
diff --git a/jni/libzrtp/cmake/Modules/UseRPMTools.cmake b/jni/libzrtp/sources/cmake/Modules/UseRPMTools.cmake
similarity index 100%
rename from jni/libzrtp/cmake/Modules/UseRPMTools.cmake
rename to jni/libzrtp/sources/cmake/Modules/UseRPMTools.cmake
diff --git a/jni/libzrtp/cmake/cmake_uninstall.cmake.in b/jni/libzrtp/sources/cmake/cmake_uninstall.cmake.in
similarity index 100%
rename from jni/libzrtp/cmake/cmake_uninstall.cmake.in
rename to jni/libzrtp/sources/cmake/cmake_uninstall.cmake.in
diff --git a/jni/libzrtp/demo/CMakeLists.txt b/jni/libzrtp/sources/demo/CMakeLists.txt
similarity index 100%
rename from jni/libzrtp/demo/CMakeLists.txt
rename to jni/libzrtp/sources/demo/CMakeLists.txt
diff --git a/jni/libzrtp/demo/README b/jni/libzrtp/sources/demo/README
similarity index 100%
rename from jni/libzrtp/demo/README
rename to jni/libzrtp/sources/demo/README
diff --git a/jni/libzrtp/demo/wrappertest.c b/jni/libzrtp/sources/demo/wrappertest.c
similarity index 100%
rename from jni/libzrtp/demo/wrappertest.c
rename to jni/libzrtp/sources/demo/wrappertest.c
diff --git a/jni/libzrtp/demo/zrtptest.cpp b/jni/libzrtp/sources/demo/zrtptest.cpp
similarity index 100%
rename from jni/libzrtp/demo/zrtptest.cpp
rename to jni/libzrtp/sources/demo/zrtptest.cpp
diff --git a/jni/libzrtp/demo/zrtptestMulti.cpp b/jni/libzrtp/sources/demo/zrtptestMulti.cpp
similarity index 100%
rename from jni/libzrtp/demo/zrtptestMulti.cpp
rename to jni/libzrtp/sources/demo/zrtptestMulti.cpp
diff --git a/jni/libzrtp/directive b/jni/libzrtp/sources/directive
similarity index 100%
rename from jni/libzrtp/directive
rename to jni/libzrtp/sources/directive
diff --git a/jni/libzrtp/doc/Doxymini b/jni/libzrtp/sources/doc/Doxymini
similarity index 100%
rename from jni/libzrtp/doc/Doxymini
rename to jni/libzrtp/sources/doc/Doxymini
diff --git a/jni/libzrtp/doc/fdl.texi b/jni/libzrtp/sources/doc/fdl.texi
similarity index 100%
rename from jni/libzrtp/doc/fdl.texi
rename to jni/libzrtp/sources/doc/fdl.texi
diff --git a/jni/libzrtp/doc/fdlnotice.texi b/jni/libzrtp/sources/doc/fdlnotice.texi
similarity index 100%
rename from jni/libzrtp/doc/fdlnotice.texi
rename to jni/libzrtp/sources/doc/fdlnotice.texi
diff --git a/jni/libzrtp/doc/gpl.texi b/jni/libzrtp/sources/doc/gpl.texi
similarity index 100%
rename from jni/libzrtp/doc/gpl.texi
rename to jni/libzrtp/sources/doc/gpl.texi
diff --git a/jni/libzrtp/libzrtpcpp-config.h.cmake b/jni/libzrtp/sources/libzrtpcpp-config.h.cmake
similarity index 100%
rename from jni/libzrtp/libzrtpcpp-config.h.cmake
rename to jni/libzrtp/sources/libzrtpcpp-config.h.cmake
diff --git a/jni/libzrtp/libzrtpcpp.pc.cmake b/jni/libzrtp/sources/libzrtpcpp.pc.cmake
similarity index 100%
rename from jni/libzrtp/libzrtpcpp.pc.cmake
rename to jni/libzrtp/sources/libzrtpcpp.pc.cmake
diff --git a/jni/libzrtp/libzrtpcpp.spec b/jni/libzrtp/sources/libzrtpcpp.spec
similarity index 100%
rename from jni/libzrtp/libzrtpcpp.spec
rename to jni/libzrtp/sources/libzrtpcpp.spec
diff --git a/jni/libzrtp/libzrtpcpp.spec.cmake b/jni/libzrtp/sources/libzrtpcpp.spec.cmake
similarity index 100%
rename from jni/libzrtp/libzrtpcpp.spec.cmake
rename to jni/libzrtp/sources/libzrtpcpp.spec.cmake
diff --git a/jni/libzrtp/src/Base32.cpp b/jni/libzrtp/sources/src/Base32.cpp
similarity index 100%
rename from jni/libzrtp/src/Base32.cpp
rename to jni/libzrtp/sources/src/Base32.cpp
diff --git a/jni/libzrtp/src/CMakeLists.txt b/jni/libzrtp/sources/src/CMakeLists.txt
similarity index 100%
rename from jni/libzrtp/src/CMakeLists.txt
rename to jni/libzrtp/sources/src/CMakeLists.txt
diff --git a/jni/libzrtp/src/ZIDFile.cpp b/jni/libzrtp/sources/src/ZIDFile.cpp
similarity index 100%
rename from jni/libzrtp/src/ZIDFile.cpp
rename to jni/libzrtp/sources/src/ZIDFile.cpp
diff --git a/jni/libzrtp/src/ZIDRecord.cpp b/jni/libzrtp/sources/src/ZIDRecord.cpp
similarity index 100%
rename from jni/libzrtp/src/ZIDRecord.cpp
rename to jni/libzrtp/sources/src/ZIDRecord.cpp
diff --git a/jni/libzrtp/src/Zrtp.cpp b/jni/libzrtp/sources/src/Zrtp.cpp
similarity index 100%
rename from jni/libzrtp/src/Zrtp.cpp
rename to jni/libzrtp/sources/src/Zrtp.cpp
diff --git a/jni/libzrtp/src/ZrtpCWrapper.cpp b/jni/libzrtp/sources/src/ZrtpCWrapper.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpCWrapper.cpp
rename to jni/libzrtp/sources/src/ZrtpCWrapper.cpp
diff --git a/jni/libzrtp/src/ZrtpCallbackWrapper.cpp b/jni/libzrtp/sources/src/ZrtpCallbackWrapper.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpCallbackWrapper.cpp
rename to jni/libzrtp/sources/src/ZrtpCallbackWrapper.cpp
diff --git a/jni/libzrtp/src/ZrtpConfigure.cpp b/jni/libzrtp/sources/src/ZrtpConfigure.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpConfigure.cpp
rename to jni/libzrtp/sources/src/ZrtpConfigure.cpp
diff --git a/jni/libzrtp/src/ZrtpCrc32.cpp b/jni/libzrtp/sources/src/ZrtpCrc32.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpCrc32.cpp
rename to jni/libzrtp/sources/src/ZrtpCrc32.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketClearAck.cpp b/jni/libzrtp/sources/src/ZrtpPacketClearAck.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketClearAck.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketClearAck.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketCommit.cpp b/jni/libzrtp/sources/src/ZrtpPacketCommit.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketCommit.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketCommit.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketConf2Ack.cpp b/jni/libzrtp/sources/src/ZrtpPacketConf2Ack.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketConf2Ack.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketConf2Ack.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketConfirm.cpp b/jni/libzrtp/sources/src/ZrtpPacketConfirm.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketConfirm.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketConfirm.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketDHPart.cpp b/jni/libzrtp/sources/src/ZrtpPacketDHPart.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketDHPart.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketDHPart.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketError.cpp b/jni/libzrtp/sources/src/ZrtpPacketError.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketError.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketError.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketErrorAck.cpp b/jni/libzrtp/sources/src/ZrtpPacketErrorAck.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketErrorAck.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketErrorAck.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketGoClear.cpp b/jni/libzrtp/sources/src/ZrtpPacketGoClear.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketGoClear.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketGoClear.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketHello.cpp b/jni/libzrtp/sources/src/ZrtpPacketHello.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketHello.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketHello.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketHelloAck.cpp b/jni/libzrtp/sources/src/ZrtpPacketHelloAck.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketHelloAck.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketHelloAck.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketPing.cpp b/jni/libzrtp/sources/src/ZrtpPacketPing.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketPing.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketPing.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketPingAck.cpp b/jni/libzrtp/sources/src/ZrtpPacketPingAck.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketPingAck.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketPingAck.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketRelayAck.cpp b/jni/libzrtp/sources/src/ZrtpPacketRelayAck.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketRelayAck.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketRelayAck.cpp
diff --git a/jni/libzrtp/src/ZrtpPacketSASrelay.cpp b/jni/libzrtp/sources/src/ZrtpPacketSASrelay.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpPacketSASrelay.cpp
rename to jni/libzrtp/sources/src/ZrtpPacketSASrelay.cpp
diff --git a/jni/libzrtp/src/ZrtpQueue.cpp b/jni/libzrtp/sources/src/ZrtpQueue.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpQueue.cpp
rename to jni/libzrtp/sources/src/ZrtpQueue.cpp
diff --git a/jni/libzrtp/src/ZrtpStateClass.cpp b/jni/libzrtp/sources/src/ZrtpStateClass.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpStateClass.cpp
rename to jni/libzrtp/sources/src/ZrtpStateClass.cpp
diff --git a/jni/libzrtp/src/ZrtpTextData.cpp b/jni/libzrtp/sources/src/ZrtpTextData.cpp
similarity index 100%
rename from jni/libzrtp/src/ZrtpTextData.cpp
rename to jni/libzrtp/sources/src/ZrtpTextData.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/Base32.h b/jni/libzrtp/sources/src/libzrtpcpp/Base32.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/Base32.h
rename to jni/libzrtp/sources/src/libzrtpcpp/Base32.h
diff --git a/jni/libzrtp/src/libzrtpcpp/CMakeLists.txt b/jni/libzrtp/sources/src/libzrtpcpp/CMakeLists.txt
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/CMakeLists.txt
rename to jni/libzrtp/sources/src/libzrtpcpp/CMakeLists.txt
diff --git a/jni/libzrtp/src/libzrtpcpp/TimeoutProvider.h b/jni/libzrtp/sources/src/libzrtpcpp/TimeoutProvider.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/TimeoutProvider.h
rename to jni/libzrtp/sources/src/libzrtpcpp/TimeoutProvider.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZIDFile.h b/jni/libzrtp/sources/src/libzrtpcpp/ZIDFile.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZIDFile.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZIDFile.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZIDRecord.h b/jni/libzrtp/sources/src/libzrtpcpp/ZIDRecord.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZIDRecord.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZIDRecord.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZRtp.h b/jni/libzrtp/sources/src/libzrtpcpp/ZRtp.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZRtp.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZRtp.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpCWrapper.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpCWrapper.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpCWrapper.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpCWrapper.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpCallback.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpCallback.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpCallback.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpCallback.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpCallbackWrapper.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpCallbackWrapper.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpCallbackWrapper.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpCallbackWrapper.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpCodes.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpCodes.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpCodes.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpCodes.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpConfigure.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpConfigure.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpConfigure.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpConfigure.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpCrc32.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpCrc32.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpCrc32.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpCrc32.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketBase.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketBase.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketBase.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketBase.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketClearAck.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketClearAck.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketClearAck.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketClearAck.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketCommit.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketCommit.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketCommit.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketCommit.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketConf2Ack.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketConf2Ack.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketConf2Ack.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketConf2Ack.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketConfirm.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketConfirm.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketConfirm.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketConfirm.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketDHPart.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketDHPart.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketDHPart.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketDHPart.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketError.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketError.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketError.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketError.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketErrorAck.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketErrorAck.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketErrorAck.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketErrorAck.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketGoClear.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketGoClear.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketGoClear.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketGoClear.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketHello.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketHello.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketHello.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketHello.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketHelloAck.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketHelloAck.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketHelloAck.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketHelloAck.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketPing.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketPing.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketPing.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketPing.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketPingAck.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketPingAck.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketPingAck.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketPingAck.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketRelayAck.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketRelayAck.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketRelayAck.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketRelayAck.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpPacketSASrelay.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketSASrelay.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpPacketSASrelay.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpPacketSASrelay.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpQueue.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpQueue.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpQueue.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpQueue.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpStateClass.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpStateClass.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpStateClass.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpStateClass.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpStates.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpStates.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpStates.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpStates.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpTextData.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpTextData.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpTextData.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpTextData.h
diff --git a/jni/libzrtp/src/libzrtpcpp/ZrtpUserCallback.h b/jni/libzrtp/sources/src/libzrtpcpp/ZrtpUserCallback.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/ZrtpUserCallback.h
rename to jni/libzrtp/sources/src/libzrtpcpp/ZrtpUserCallback.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/TwoCFB.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/TwoCFB.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/TwoCFB.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/TwoCFB.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/ZrtpDH.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/ZrtpDH.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/ZrtpDH.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/ZrtpDH.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/aesCFB.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/aesCFB.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/aesCFB.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/aesCFB.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/InitializeGcrypt.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptZrtpDH.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptZrtpDH.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptZrtpDH.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptZrtpDH.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcrypthmac256.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcrypthmac256.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcrypthmac256.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcrypthmac256.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcrypthmac384.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcrypthmac384.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcrypthmac384.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcrypthmac384.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptsha256.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptsha256.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptsha256.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptsha256.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptsha384.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptsha384.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/gcrypt/gcryptsha384.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/gcrypt/gcryptsha384.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/hmac256.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/hmac256.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/hmac256.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/hmac256.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/hmac384.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/hmac384.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/hmac384.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/hmac384.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/openssl/AesCFB.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/AesCFB.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/openssl/AesCFB.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/AesCFB.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/openssl/InitializeOpenSSL.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/InitializeOpenSSL.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/openssl/InitializeOpenSSL.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/InitializeOpenSSL.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/openssl/ZrtpDH.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/ZrtpDH.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/openssl/ZrtpDH.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/ZrtpDH.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/openssl/hmac256.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/hmac256.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/openssl/hmac256.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/hmac256.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/openssl/hmac384.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/hmac384.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/openssl/hmac384.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/hmac384.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/openssl/sha256.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/sha256.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/openssl/sha256.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/sha256.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/openssl/sha384.cpp b/jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/sha384.cpp
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/openssl/sha384.cpp
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/openssl/sha384.cpp
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/sha256.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/sha256.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/sha256.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/sha256.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/sha384.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/sha384.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/sha384.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/sha384.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/twoCFB.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/twoCFB.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/twoCFB.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/twoCFB.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/twofish.c b/jni/libzrtp/sources/src/libzrtpcpp/crypto/twofish.c
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/twofish.c
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/twofish.c
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/twofish.h b/jni/libzrtp/sources/src/libzrtpcpp/crypto/twofish.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/twofish.h
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/twofish.h
diff --git a/jni/libzrtp/src/libzrtpcpp/crypto/twofish_cfb.c b/jni/libzrtp/sources/src/libzrtpcpp/crypto/twofish_cfb.c
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/crypto/twofish_cfb.c
rename to jni/libzrtp/sources/src/libzrtpcpp/crypto/twofish_cfb.c
diff --git a/jni/libzrtp/src/libzrtpcpp/zrtpPacket.h b/jni/libzrtp/sources/src/libzrtpcpp/zrtpPacket.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/zrtpPacket.h
rename to jni/libzrtp/sources/src/libzrtpcpp/zrtpPacket.h
diff --git a/jni/libzrtp/src/libzrtpcpp/zrtpccrtp.h b/jni/libzrtp/sources/src/libzrtpcpp/zrtpccrtp.h
similarity index 100%
rename from jni/libzrtp/src/libzrtpcpp/zrtpccrtp.h
rename to jni/libzrtp/sources/src/libzrtpcpp/zrtpccrtp.h
diff --git a/jni/libzrtp/srtp/CryptoContext.cpp b/jni/libzrtp/sources/srtp/CryptoContext.cpp
similarity index 100%
rename from jni/libzrtp/srtp/CryptoContext.cpp
rename to jni/libzrtp/sources/srtp/CryptoContext.cpp
diff --git a/jni/libzrtp/srtp/CryptoContext.h b/jni/libzrtp/sources/srtp/CryptoContext.h
similarity index 100%
rename from jni/libzrtp/srtp/CryptoContext.h
rename to jni/libzrtp/sources/srtp/CryptoContext.h
diff --git a/jni/libzrtp/srtp/CryptoContextCtrl.cpp b/jni/libzrtp/sources/srtp/CryptoContextCtrl.cpp
similarity index 100%
rename from jni/libzrtp/srtp/CryptoContextCtrl.cpp
rename to jni/libzrtp/sources/srtp/CryptoContextCtrl.cpp
diff --git a/jni/libzrtp/srtp/CryptoContextCtrl.h b/jni/libzrtp/sources/srtp/CryptoContextCtrl.h
similarity index 100%
rename from jni/libzrtp/srtp/CryptoContextCtrl.h
rename to jni/libzrtp/sources/srtp/CryptoContextCtrl.h
diff --git a/jni/libzrtp/srtp/crypto/SrtpSymCrypto.h b/jni/libzrtp/sources/srtp/crypto/SrtpSymCrypto.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/SrtpSymCrypto.h
rename to jni/libzrtp/sources/srtp/crypto/SrtpSymCrypto.h
diff --git a/jni/libzrtp/srtp/crypto/brg_endian.h b/jni/libzrtp/sources/srtp/crypto/brg_endian.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/brg_endian.h
rename to jni/libzrtp/sources/srtp/crypto/brg_endian.h
diff --git a/jni/libzrtp/srtp/crypto/brg_types.h b/jni/libzrtp/sources/srtp/crypto/brg_types.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/brg_types.h
rename to jni/libzrtp/sources/srtp/crypto/brg_types.h
diff --git a/jni/libzrtp/srtp/crypto/gcrypt/InitializeGcrypt.cpp b/jni/libzrtp/sources/srtp/crypto/gcrypt/InitializeGcrypt.cpp
similarity index 100%
rename from jni/libzrtp/srtp/crypto/gcrypt/InitializeGcrypt.cpp
rename to jni/libzrtp/sources/srtp/crypto/gcrypt/InitializeGcrypt.cpp
diff --git a/jni/libzrtp/srtp/crypto/gcrypt/gcryptSrtpSymCrypto.cpp b/jni/libzrtp/sources/srtp/crypto/gcrypt/gcryptSrtpSymCrypto.cpp
similarity index 100%
rename from jni/libzrtp/srtp/crypto/gcrypt/gcryptSrtpSymCrypto.cpp
rename to jni/libzrtp/sources/srtp/crypto/gcrypt/gcryptSrtpSymCrypto.cpp
diff --git a/jni/libzrtp/srtp/crypto/gcrypt/gcrypthmac.cpp b/jni/libzrtp/sources/srtp/crypto/gcrypt/gcrypthmac.cpp
similarity index 100%
rename from jni/libzrtp/srtp/crypto/gcrypt/gcrypthmac.cpp
rename to jni/libzrtp/sources/srtp/crypto/gcrypt/gcrypthmac.cpp
diff --git a/jni/libzrtp/srtp/crypto/hmac.h b/jni/libzrtp/sources/srtp/crypto/hmac.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/hmac.h
rename to jni/libzrtp/sources/srtp/crypto/hmac.h
diff --git a/jni/libzrtp/srtp/crypto/macSkein.cpp b/jni/libzrtp/sources/srtp/crypto/macSkein.cpp
similarity index 100%
rename from jni/libzrtp/srtp/crypto/macSkein.cpp
rename to jni/libzrtp/sources/srtp/crypto/macSkein.cpp
diff --git a/jni/libzrtp/srtp/crypto/macSkein.h b/jni/libzrtp/sources/srtp/crypto/macSkein.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/macSkein.h
rename to jni/libzrtp/sources/srtp/crypto/macSkein.h
diff --git a/jni/libzrtp/srtp/crypto/openssl/SrtpSymCrypto.cpp b/jni/libzrtp/sources/srtp/crypto/openssl/SrtpSymCrypto.cpp
similarity index 100%
rename from jni/libzrtp/srtp/crypto/openssl/SrtpSymCrypto.cpp
rename to jni/libzrtp/sources/srtp/crypto/openssl/SrtpSymCrypto.cpp
diff --git a/jni/libzrtp/srtp/crypto/openssl/hmac.cpp b/jni/libzrtp/sources/srtp/crypto/openssl/hmac.cpp
similarity index 100%
rename from jni/libzrtp/srtp/crypto/openssl/hmac.cpp
rename to jni/libzrtp/sources/srtp/crypto/openssl/hmac.cpp
diff --git a/jni/libzrtp/srtp/crypto/skein.c b/jni/libzrtp/sources/srtp/crypto/skein.c
similarity index 100%
rename from jni/libzrtp/srtp/crypto/skein.c
rename to jni/libzrtp/sources/srtp/crypto/skein.c
diff --git a/jni/libzrtp/srtp/crypto/skein.h b/jni/libzrtp/sources/srtp/crypto/skein.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/skein.h
rename to jni/libzrtp/sources/srtp/crypto/skein.h
diff --git a/jni/libzrtp/srtp/crypto/skeinApi.c b/jni/libzrtp/sources/srtp/crypto/skeinApi.c
similarity index 100%
rename from jni/libzrtp/srtp/crypto/skeinApi.c
rename to jni/libzrtp/sources/srtp/crypto/skeinApi.c
diff --git a/jni/libzrtp/srtp/crypto/skeinApi.h b/jni/libzrtp/sources/srtp/crypto/skeinApi.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/skeinApi.h
rename to jni/libzrtp/sources/srtp/crypto/skeinApi.h
diff --git a/jni/libzrtp/srtp/crypto/skein_block.c b/jni/libzrtp/sources/srtp/crypto/skein_block.c
similarity index 100%
rename from jni/libzrtp/srtp/crypto/skein_block.c
rename to jni/libzrtp/sources/srtp/crypto/skein_block.c
diff --git a/jni/libzrtp/srtp/crypto/skein_iv.h b/jni/libzrtp/sources/srtp/crypto/skein_iv.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/skein_iv.h
rename to jni/libzrtp/sources/srtp/crypto/skein_iv.h
diff --git a/jni/libzrtp/srtp/crypto/skein_port.h b/jni/libzrtp/sources/srtp/crypto/skein_port.h
similarity index 100%
rename from jni/libzrtp/srtp/crypto/skein_port.h
rename to jni/libzrtp/sources/srtp/crypto/skein_port.h