summaryrefslogtreecommitdiff
path: root/legacy/eobj
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-09 07:03:17 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-09 07:03:17 +0000
commitc101b8facf2b55ce5ad0e5956484ce2c4c46d25b (patch)
tree0ae5bf26deccc201c763ae657f4a36a8d8037762 /legacy/eobj
parent1220a85df5ac908b2e4608bba198ad5d767bfa18 (diff)
Eo: more dos2unix
SVN revision: 76350
Diffstat (limited to 'legacy/eobj')
-rw-r--r--legacy/eobj/AUTHORS2
-rw-r--r--legacy/eobj/configure.ac398
-rw-r--r--legacy/eobj/src/Makefile.am36
-rw-r--r--legacy/eobj/src/benchmarks/Makefile.am52
-rw-r--r--legacy/eobj/src/lib/Makefile.am38
5 files changed, 263 insertions, 263 deletions
diff --git a/legacy/eobj/AUTHORS b/legacy/eobj/AUTHORS
index fe7b20832b..ee22837766 100644
--- a/legacy/eobj/AUTHORS
+++ b/legacy/eobj/AUTHORS
@@ -1 +1 @@
Tom Hacohen <tom@stosb.com> Tom Hacohen <tom@stosb.com>
diff --git a/legacy/eobj/configure.ac b/legacy/eobj/configure.ac
index 0bdd0c8274..c7b22288b5 100644
--- a/legacy/eobj/configure.ac
+++ b/legacy/eobj/configure.ac
@@ -1,199 +1,199 @@
1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [7]) 4m4_define([v_min], [7])
5m4_define([v_mic], [99]) 5m4_define([v_mic], [99])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9dnl m4_undefine([v_rev]) 9dnl m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11dnl m4_define([relname], [ver-pre-svn-07]) 11dnl m4_define([relname], [ver-pre-svn-07])
12dnl m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])
13##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 13##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
14m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])]) 14m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])])
15m4_define([lt_cur], m4_eval(v_maj + v_min)) 15m4_define([lt_cur], m4_eval(v_maj + v_min))
16m4_define([lt_rev], v_mic) 16m4_define([lt_rev], v_mic)
17m4_define([lt_age], v_min) 17m4_define([lt_age], v_min)
18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
20 20
21AC_INIT([eo], [v_ver], [enlightenment-devel@lists.sourceforge.net]) 21AC_INIT([eo], [v_ver], [enlightenment-devel@lists.sourceforge.net])
22AC_PREREQ([2.59]) 22AC_PREREQ([2.59])
23AC_CONFIG_SRCDIR([configure.ac]) 23AC_CONFIG_SRCDIR([configure.ac])
24AC_CONFIG_MACRO_DIR([m4]) 24AC_CONFIG_MACRO_DIR([m4])
25 25
26AC_CONFIG_HEADERS([config.h]) 26AC_CONFIG_HEADERS([config.h])
27AH_TOP([ 27AH_TOP([
28#ifndef EFL_CONFIG_H__ 28#ifndef EFL_CONFIG_H__
29#define EFL_CONFIG_H__ 29#define EFL_CONFIG_H__
30]) 30])
31AH_BOTTOM([ 31AH_BOTTOM([
32#endif /* EFL_CONFIG_H__ */ 32#endif /* EFL_CONFIG_H__ */
33]) 33])
34 34
35AM_INIT_AUTOMAKE([1.6 dist-bzip2]) 35AM_INIT_AUTOMAKE([1.6 dist-bzip2])
36m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 36m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
37 37
38#lt_cv_deplibs_check_method='pass_all' 38#lt_cv_deplibs_check_method='pass_all'
39AC_LIBTOOL_WIN32_DLL 39AC_LIBTOOL_WIN32_DLL
40define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl 40define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
41define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl 41define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
42AC_PROG_LIBTOOL 42AC_PROG_LIBTOOL
43 43
44##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 44##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
45##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 45##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
46m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) 46m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
47m4_ifdef([v_rel], , [m4_define([v_rel], [])]) 47m4_ifdef([v_rel], , [m4_define([v_rel], [])])
48AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version]) 48AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])
49AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version]) 49AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])
50AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version]) 50AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])
51AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison]) 51AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison])
52version_info="lt_cur:lt_rev:lt_age" 52version_info="lt_cur:lt_rev:lt_age"
53release_info="v_rel" 53release_info="v_rel"
54AC_SUBST([version_info]) 54AC_SUBST([version_info])
55AC_SUBST([release_info]) 55AC_SUBST([release_info])
56##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 56##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
57##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 57##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
58VMAJ=v_maj 58VMAJ=v_maj
59AC_SUBST([VMAJ]) 59AC_SUBST([VMAJ])
60 60
61 61
62### Needed information 62### Needed information
63 63
64AC_CANONICAL_HOST 64AC_CANONICAL_HOST
65 65
66EFL_EO_BUILD="" 66EFL_EO_BUILD=""
67case "$host_os" in 67case "$host_os" in
68 mingw*) 68 mingw*)
69 EFL_EO_BUILD="-DEFL_EO_BUILD" 69 EFL_EO_BUILD="-DEFL_EO_BUILD"
70 ;; 70 ;;
71esac 71esac
72AC_SUBST([EFL_EO_BUILD]) 72AC_SUBST([EFL_EO_BUILD])
73 73
74requirements_pc_eo="eina" 74requirements_pc_eo="eina"
75 75
76 76
77### Additional options to configure 77### Additional options to configure
78 78
79 79
80### Checks for programs 80### Checks for programs
81 81
82AC_PROG_CC 82AC_PROG_CC
83 83
84# pkg-config 84# pkg-config
85PKG_PROG_PKG_CONFIG 85PKG_PROG_PKG_CONFIG
86 86
87# Check whether pkg-config supports Requires.private 87# Check whether pkg-config supports Requires.private
88if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then 88if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
89 pkgconfig_requires_private="Requires.private" 89 pkgconfig_requires_private="Requires.private"
90else 90else
91 pkgconfig_requires_private="Requires" 91 pkgconfig_requires_private="Requires"
92fi 92fi
93AC_SUBST(pkgconfig_requires_private) 93AC_SUBST(pkgconfig_requires_private)
94 94
95# doxygen program for documentation building 95# doxygen program for documentation building
96 96
97EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) 97EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
98 98
99 99
100### Checks for libraries 100### Checks for libraries
101 101
102PKG_CHECK_MODULES([EO], [${requirements_pc_eo}]) 102PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
103 103
104PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) 104PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
105 105
106AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) 106AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
107 107
108 108
109### Checks for header files 109### Checks for header files
110 110
111AC_CHECK_HEADERS([stdarg.h]) 111AC_CHECK_HEADERS([stdarg.h])
112 112
113 113
114### Checks for types 114### Checks for types
115 115
116 116
117### Checks for structures 117### Checks for structures
118 118
119 119
120### Checks for compiler characteristics 120### Checks for compiler characteristics
121 121
122 122
123### Checks for linker characteristics 123### Checks for linker characteristics
124 124
125lt_enable_auto_import="" 125lt_enable_auto_import=""
126case "${host_os}" in 126case "${host_os}" in
127 mingw*) 127 mingw*)
128 lt_enable_auto_import="-Wl,--enable-auto-import" 128 lt_enable_auto_import="-Wl,--enable-auto-import"
129 ;; 129 ;;
130esac 130esac
131AC_SUBST([lt_enable_auto_import]) 131AC_SUBST([lt_enable_auto_import])
132 132
133### Checks for library functions 133### Checks for library functions
134 134
135### Make the debug preprocessor configurable 135### Make the debug preprocessor configurable
136 136
137### Unit tests, coverage and benchmarking 137### Unit tests, coverage and benchmarking
138 138
139EFL_CHECK_TESTS([eina], [enable_tests="yes"], [enable_tests="no"]) 139EFL_CHECK_TESTS([eina], [enable_tests="yes"], [enable_tests="no"])
140 140
141EFL_CHECK_BENCHMARK([enable_benchmark="yes"], [enable_benchmark="no"]) 141EFL_CHECK_BENCHMARK([enable_benchmark="yes"], [enable_benchmark="no"])
142 142
143AC_SUBST([requirements_pc_eo]) 143AC_SUBST([requirements_pc_eo])
144 144
145 145
146### Build and install examples 146### Build and install examples
147EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) 147EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
148 148
149AC_CONFIG_FILES([ 149AC_CONFIG_FILES([
150Makefile 150Makefile
151eo.pc 151eo.pc
152doc/Doxyfile 152doc/Doxyfile
153doc/Makefile 153doc/Makefile
154src/Makefile 154src/Makefile
155src/benchmarks/Makefile 155src/benchmarks/Makefile
156src/examples/Makefile 156src/examples/Makefile
157src/examples/eo_isa/Makefile 157src/examples/eo_isa/Makefile
158src/examples/evas/Makefile 158src/examples/evas/Makefile
159src/examples/simple/Makefile 159src/examples/simple/Makefile
160src/lib/Makefile 160src/lib/Makefile
161src/tests/Makefile 161src/tests/Makefile
162src/tests/access/Makefile 162src/tests/access/Makefile
163src/tests/composite_objects/Makefile 163src/tests/composite_objects/Makefile
164src/tests/constructors/Makefile 164src/tests/constructors/Makefile
165src/tests/eo_suite/Makefile 165src/tests/eo_suite/Makefile
166src/tests/function_overrides/Makefile 166src/tests/function_overrides/Makefile
167src/tests/interface/Makefile 167src/tests/interface/Makefile
168src/tests/mixin/Makefile 168src/tests/mixin/Makefile
169src/tests/signals/Makefile 169src/tests/signals/Makefile
170]) 170])
171 171
172AC_OUTPUT 172AC_OUTPUT
173 173
174##################################################################### 174#####################################################################
175## Info 175## Info
176 176
177echo 177echo
178echo 178echo
179echo 179echo
180echo "------------------------------------------------------------------------" 180echo "------------------------------------------------------------------------"
181echo "$PACKAGE $VERSION" 181echo "$PACKAGE $VERSION"
182echo "------------------------------------------------------------------------" 182echo "------------------------------------------------------------------------"
183echo 183echo
184echo 184echo
185echo "Configuration Options Summary:" 185echo "Configuration Options Summary:"
186echo 186echo
187echo " Documentation........: ${build_doc}" 187echo " Documentation........: ${build_doc}"
188echo " Unit Tests...........: ${enable_tests} (Coverage: ${efl_enable_coverage})" 188echo " Unit Tests...........: ${enable_tests} (Coverage: ${efl_enable_coverage})"
189echo " Examples.............: ${enable_build_examples}" 189echo " Examples.............: ${enable_build_examples}"
190echo " Benchmark............: ${enable_benchmark}" 190echo " Benchmark............: ${enable_benchmark}"
191echo 191echo
192echo "Compilation............: make (or gmake)" 192echo "Compilation............: make (or gmake)"
193echo " CPPFLAGS.............: $CPPFLAGS" 193echo " CPPFLAGS.............: $CPPFLAGS"
194echo " CFLAGS...............: $CFLAGS" 194echo " CFLAGS...............: $CFLAGS"
195echo " LDFLAGS..............: $LDFLAGS" 195echo " LDFLAGS..............: $LDFLAGS"
196echo 196echo
197echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" 197echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
198echo " prefix...............: $prefix" 198echo " prefix...............: $prefix"
199echo 199echo
diff --git a/legacy/eobj/src/Makefile.am b/legacy/eobj/src/Makefile.am
index 849ab4182c..b6a0867c8b 100644
--- a/legacy/eobj/src/Makefile.am
+++ b/legacy/eobj/src/Makefile.am
@@ -1,18 +1,18 @@
1 1
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4SUBDIRS = lib benchmarks examples tests 4SUBDIRS = lib benchmarks examples tests
5 5
6.PHONY: benchmark 6.PHONY: benchmark
7 7
8if EFL_ENABLE_BENCHMARK 8if EFL_ENABLE_BENCHMARK
9 9
10benchmark: all 10benchmark: all
11 cd benchamrks && make eo_bench 11 cd benchamrks && make eo_bench
12 12
13else 13else
14 14
15benchmark: 15benchmark:
16 @echo "reconfigure with --enable-benchmark" 16 @echo "reconfigure with --enable-benchmark"
17 17
18endif 18endif
diff --git a/legacy/eobj/src/benchmarks/Makefile.am b/legacy/eobj/src/benchmarks/Makefile.am
index 2ee6cbbbbc..a3a853ef67 100644
--- a/legacy/eobj/src/benchmarks/Makefile.am
+++ b/legacy/eobj/src/benchmarks/Makefile.am
@@ -1,26 +1,26 @@
1 1
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4AM_CPPFLAGS = \ 4AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib \ 5-I$(top_srcdir)/src/lib \
6-I$(top_builddir)/src/lib \ 6-I$(top_builddir)/src/lib \
7@EFL_EO_BUILD@ \ 7@EFL_EO_BUILD@ \
8@EO_CFLAGS@ 8@EO_CFLAGS@
9 9
10if EFL_ENABLE_BENCHMARK 10if EFL_ENABLE_BENCHMARK
11 11
12noinst_PROGRAMS = eo_bench 12noinst_PROGRAMS = eo_bench
13 13
14eo_bench_SOURCES = \ 14eo_bench_SOURCES = \
15class_simple.c \ 15class_simple.c \
16class_simple.h \ 16class_simple.h \
17eo_bench.c \ 17eo_bench.c \
18eo_bench.h \ 18eo_bench.h \
19eo_bench_eo_do.c 19eo_bench_eo_do.c
20 20
21eo_bench_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@ 21eo_bench_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
22 22
23endif 23endif
24 24
25clean-local: 25clean-local:
26 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda 26 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
diff --git a/legacy/eobj/src/lib/Makefile.am b/legacy/eobj/src/lib/Makefile.am
index 89fefd36f4..777891f615 100644
--- a/legacy/eobj/src/lib/Makefile.am
+++ b/legacy/eobj/src/lib/Makefile.am
@@ -1,19 +1,19 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/lib \ 4-I$(top_srcdir)/src/lib \
5-I$(top_builddir)/src/lib \ 5-I$(top_builddir)/src/lib \
6@EFL_EO_BUILD@ \ 6@EFL_EO_BUILD@ \
7@EO_CFLAGS@ 7@EO_CFLAGS@
8 8
9installed_headerdir = $(includedir)/eo-@VMAJ@ 9installed_headerdir = $(includedir)/eo-@VMAJ@
10dist_installed_header_DATA = Eo.h 10dist_installed_header_DATA = Eo.h
11 11
12lib_LTLIBRARIES = libeo.la 12lib_LTLIBRARIES = libeo.la
13 13
14libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h 14libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h
15libeo_la_LIBADD = @EO_LIBS@ 15libeo_la_LIBADD = @EO_LIBS@
16libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 16libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
17 17
18clean-local: 18clean-local:
19 rm -rf *.gcno 19 rm -rf *.gcno