summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-01 16:58:56 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-01 16:58:56 +0000
commit109efca5cb77a6260330e89856af05425429ea71 (patch)
tree2ac4c02a3abf59b44f77174a27f466f485e2bcf4 /src
parent5b00d44ec6c847af582b2e31ec2fe0a28b8a3a51 (diff)
merge: move lz4 to src/static_libs/lz4 (same will hold for evas' linebreak), ignore++--
SVN revision: 78807
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Eet.am14
-rw-r--r--src/static_libs/lz4/README (renamed from src/lib/eet/lz4/README)0
-rw-r--r--src/static_libs/lz4/lz4.c (renamed from src/lib/eet/lz4/lz4.c)0
-rw-r--r--src/static_libs/lz4/lz4.h (renamed from src/lib/eet/lz4/lz4.h)0
-rw-r--r--src/static_libs/lz4/lz4hc.c (renamed from src/lib/eet/lz4/lz4hc.c)0
-rw-r--r--src/static_libs/lz4/lz4hc.h (renamed from src/lib/eet/lz4/lz4hc.h)0
6 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 1c186d6820..625a19a66e 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -17,18 +17,18 @@ lib/eet/eet_image.c \
17lib/eet/eet_lib.c \ 17lib/eet/eet_lib.c \
18lib/eet/eet_node.c \ 18lib/eet/eet_node.c \
19lib/eet/eet_utils.c \ 19lib/eet/eet_utils.c \
20lib/eet/lz4/lz4.c \ 20static_libs/lz4/lz4.c \
21lib/eet/lz4/lz4.h \ 21static_libs/lz4/lz4.h \
22lib/eet/lz4/lz4hc.c \ 22static_libs/lz4/lz4hc.c \
23lib/eet/lz4/lz4hc.h 23static_libs/lz4/lz4hc.h
24 24
25lib_eet_libeet_la_CPPFLAGS = \ 25lib_eet_libeet_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/eina \ 26-I$(top_srcdir)/src/lib/eina \
27-I$(top_srcdir)/src/lib/eet \ 27-I$(top_srcdir)/src/lib/eet \
28-I$(top_srcdir)/src/lib/eet/lz4 \ 28-I$(top_srcdir)/src/static_libs/lz4 \
29-I$(top_builddir)/src/lib/eina \ 29-I$(top_builddir)/src/lib/eina \
30-I$(top_builddir)/src/lib/eet \ 30-I$(top_builddir)/src/lib/eet \
31-I$(top_builddir)/src/lib/eet/lz4 \ 31-I$(top_builddir)/src/static_libs/lz4 \
32-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 32-DPACKAGE_BIN_DIR=\"$(bindir)\" \
33-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 33-DPACKAGE_LIB_DIR=\"$(libdir)\" \
34-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 34-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@@ -52,7 +52,7 @@ lib_eet_libeet_la_LIBADD += @EET_LIBS@ -lm
52 52
53lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 53lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
54 54
55EXTRA_DIST += lib/eet/lz4/README 55EXTRA_DIST += static_libs/lz4/README
56 56
57### Binary 57### Binary
58 58
diff --git a/src/lib/eet/lz4/README b/src/static_libs/lz4/README
index 0abb85714a..0abb85714a 100644
--- a/src/lib/eet/lz4/README
+++ b/src/static_libs/lz4/README
diff --git a/src/lib/eet/lz4/lz4.c b/src/static_libs/lz4/lz4.c
index eeefa67388..eeefa67388 100644
--- a/src/lib/eet/lz4/lz4.c
+++ b/src/static_libs/lz4/lz4.c
diff --git a/src/lib/eet/lz4/lz4.h b/src/static_libs/lz4/lz4.h
index e3df7bd70c..e3df7bd70c 100644
--- a/src/lib/eet/lz4/lz4.h
+++ b/src/static_libs/lz4/lz4.h
diff --git a/src/lib/eet/lz4/lz4hc.c b/src/static_libs/lz4/lz4hc.c
index 2ab507e1c9..2ab507e1c9 100644
--- a/src/lib/eet/lz4/lz4hc.c
+++ b/src/static_libs/lz4/lz4hc.c
diff --git a/src/lib/eet/lz4/lz4hc.h b/src/static_libs/lz4/lz4hc.h
index cb74689f07..cb74689f07 100644
--- a/src/lib/eet/lz4/lz4hc.h
+++ b/src/static_libs/lz4/lz4hc.h