diff options
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | configure.ac | 398 | ||||
-rw-r--r-- | src/Makefile.am | 36 | ||||
-rw-r--r-- | src/benchmarks/Makefile.am | 52 | ||||
-rw-r--r-- | src/lib/Makefile.am | 38 |
5 files changed, 263 insertions, 263 deletions
@@ -1 +1 @@ -Tom Hacohen <tom@stosb.com>
+Tom Hacohen <tom@stosb.com> diff --git a/configure.ac b/configure.ac index 0bdd0c8..c7b2228 100644 --- a/configure.ac +++ b/configure.ac @@ -1,199 +1,199 @@ -##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_define([v_maj], [1])
-m4_define([v_min], [7])
-m4_define([v_mic], [99])
-m4_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']))
-m4_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']))])
-##-- When released, remove the dnl on the below line
-dnl m4_undefine([v_rev])
-##-- When doing snapshots - change soname. remove dnl on below line
-dnl m4_define([relname], [ver-pre-svn-07])
-dnl m4_define([v_rel], [-release relname])
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_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])])
-m4_define([lt_cur], m4_eval(v_maj + v_min))
-m4_define([lt_rev], v_mic)
-m4_define([lt_age], v_min)
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-
-AC_INIT([eo], [v_ver], [enlightenment-devel@lists.sourceforge.net])
-AC_PREREQ([2.59])
-AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_CONFIG_HEADERS([config.h])
-AH_TOP([
-#ifndef EFL_CONFIG_H__
-#define EFL_CONFIG_H__
-])
-AH_BOTTOM([
-#endif /* EFL_CONFIG_H__ */
-])
-
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-#lt_cv_deplibs_check_method='pass_all'
-AC_LIBTOOL_WIN32_DLL
-define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
-define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
-AC_PROG_LIBTOOL
-
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
-m4_ifdef([v_rel], , [m4_define([v_rel], [])])
-AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])
-AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])
-AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])
-AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison])
-version_info="lt_cur:lt_rev:lt_age"
-release_info="v_rel"
-AC_SUBST([version_info])
-AC_SUBST([release_info])
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-VMAJ=v_maj
-AC_SUBST([VMAJ])
-
-
-### Needed information
-
-AC_CANONICAL_HOST
-
-EFL_EO_BUILD=""
-case "$host_os" in
- mingw*)
- EFL_EO_BUILD="-DEFL_EO_BUILD"
- ;;
-esac
-AC_SUBST([EFL_EO_BUILD])
-
-requirements_pc_eo="eina"
-
-
-### Additional options to configure
-
-
-### Checks for programs
-
-AC_PROG_CC
-
-# pkg-config
-PKG_PROG_PKG_CONFIG
-
-# Check whether pkg-config supports Requires.private
-if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
- pkgconfig_requires_private="Requires.private"
-else
- pkgconfig_requires_private="Requires"
-fi
-AC_SUBST(pkgconfig_requires_private)
-
-# doxygen program for documentation building
-
-EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
-
-
-### Checks for libraries
-
-PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
-
-PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"])
-
-AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
-
-
-### Checks for header files
-
-AC_CHECK_HEADERS([stdarg.h])
-
-
-### Checks for types
-
-
-### Checks for structures
-
-
-### Checks for compiler characteristics
-
-
-### Checks for linker characteristics
-
-lt_enable_auto_import=""
-case "${host_os}" in
- mingw*)
- lt_enable_auto_import="-Wl,--enable-auto-import"
- ;;
-esac
-AC_SUBST([lt_enable_auto_import])
-
-### Checks for library functions
-
-### Make the debug preprocessor configurable
-
-### Unit tests, coverage and benchmarking
-
-EFL_CHECK_TESTS([eina], [enable_tests="yes"], [enable_tests="no"])
-
-EFL_CHECK_BENCHMARK([enable_benchmark="yes"], [enable_benchmark="no"])
-
-AC_SUBST([requirements_pc_eo])
-
-
-### Build and install examples
-EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
-
-AC_CONFIG_FILES([
-Makefile
-eo.pc
-doc/Doxyfile
-doc/Makefile
-src/Makefile
-src/benchmarks/Makefile
-src/examples/Makefile
-src/examples/eo_isa/Makefile
-src/examples/evas/Makefile
-src/examples/simple/Makefile
-src/lib/Makefile
-src/tests/Makefile
-src/tests/access/Makefile
-src/tests/composite_objects/Makefile
-src/tests/constructors/Makefile
-src/tests/eo_suite/Makefile
-src/tests/function_overrides/Makefile
-src/tests/interface/Makefile
-src/tests/mixin/Makefile
-src/tests/signals/Makefile
-])
-
-AC_OUTPUT
-
-#####################################################################
-## Info
-
-echo
-echo
-echo
-echo "------------------------------------------------------------------------"
-echo "$PACKAGE $VERSION"
-echo "------------------------------------------------------------------------"
-echo
-echo
-echo "Configuration Options Summary:"
-echo
-echo " Documentation........: ${build_doc}"
-echo " Unit Tests...........: ${enable_tests} (Coverage: ${efl_enable_coverage})"
-echo " Examples.............: ${enable_build_examples}"
-echo " Benchmark............: ${enable_benchmark}"
-echo
-echo "Compilation............: make (or gmake)"
-echo " CPPFLAGS.............: $CPPFLAGS"
-echo " CFLAGS...............: $CFLAGS"
-echo " LDFLAGS..............: $LDFLAGS"
-echo
-echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
-echo " prefix...............: $prefix"
-echo
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_define([v_maj], [1]) +m4_define([v_min], [7]) +m4_define([v_mic], [99]) +m4_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'])) +m4_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']))]) +##-- When released, remove the dnl on the below line +dnl m4_undefine([v_rev]) +##-- When doing snapshots - change soname. remove dnl on below line +dnl m4_define([relname], [ver-pre-svn-07]) +dnl m4_define([v_rel], [-release relname]) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_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])]) +m4_define([lt_cur], m4_eval(v_maj + v_min)) +m4_define([lt_rev], v_mic) +m4_define([lt_age], v_min) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## + +AC_INIT([eo], [v_ver], [enlightenment-devel@lists.sourceforge.net]) +AC_PREREQ([2.59]) +AC_CONFIG_SRCDIR([configure.ac]) +AC_CONFIG_MACRO_DIR([m4]) + +AC_CONFIG_HEADERS([config.h]) +AH_TOP([ +#ifndef EFL_CONFIG_H__ +#define EFL_CONFIG_H__ +]) +AH_BOTTOM([ +#endif /* EFL_CONFIG_H__ */ +]) + +AM_INIT_AUTOMAKE([1.6 dist-bzip2]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +#lt_cv_deplibs_check_method='pass_all' +AC_LIBTOOL_WIN32_DLL +define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +AC_PROG_LIBTOOL + +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) +m4_ifdef([v_rel], , [m4_define([v_rel], [])]) +AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version]) +AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version]) +AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version]) +AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison]) +version_info="lt_cur:lt_rev:lt_age" +release_info="v_rel" +AC_SUBST([version_info]) +AC_SUBST([release_info]) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +VMAJ=v_maj +AC_SUBST([VMAJ]) + + +### Needed information + +AC_CANONICAL_HOST + +EFL_EO_BUILD="" +case "$host_os" in + mingw*) + EFL_EO_BUILD="-DEFL_EO_BUILD" + ;; +esac +AC_SUBST([EFL_EO_BUILD]) + +requirements_pc_eo="eina" + + +### Additional options to configure + + +### Checks for programs + +AC_PROG_CC + +# pkg-config +PKG_PROG_PKG_CONFIG + +# Check whether pkg-config supports Requires.private +if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then + pkgconfig_requires_private="Requires.private" +else + pkgconfig_requires_private="Requires" +fi +AC_SUBST(pkgconfig_requires_private) + +# doxygen program for documentation building + +EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) + + +### Checks for libraries + +PKG_CHECK_MODULES([EO], [${requirements_pc_eo}]) + +PKG_CHECK_MODULES([ELM], [elementary >= 1.7.0], [have_elm="yes"], [have_elm="no"]) + +AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"]) + + +### Checks for header files + +AC_CHECK_HEADERS([stdarg.h]) + + +### Checks for types + + +### Checks for structures + + +### Checks for compiler characteristics + + +### Checks for linker characteristics + +lt_enable_auto_import="" +case "${host_os}" in + mingw*) + lt_enable_auto_import="-Wl,--enable-auto-import" + ;; +esac +AC_SUBST([lt_enable_auto_import]) + +### Checks for library functions + +### Make the debug preprocessor configurable + +### Unit tests, coverage and benchmarking + +EFL_CHECK_TESTS([eina], [enable_tests="yes"], [enable_tests="no"]) + +EFL_CHECK_BENCHMARK([enable_benchmark="yes"], [enable_benchmark="no"]) + +AC_SUBST([requirements_pc_eo]) + + +### Build and install examples +EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) + +AC_CONFIG_FILES([ +Makefile +eo.pc +doc/Doxyfile +doc/Makefile +src/Makefile +src/benchmarks/Makefile +src/examples/Makefile +src/examples/eo_isa/Makefile +src/examples/evas/Makefile +src/examples/simple/Makefile +src/lib/Makefile +src/tests/Makefile +src/tests/access/Makefile +src/tests/composite_objects/Makefile +src/tests/constructors/Makefile +src/tests/eo_suite/Makefile +src/tests/function_overrides/Makefile +src/tests/interface/Makefile +src/tests/mixin/Makefile +src/tests/signals/Makefile +]) + +AC_OUTPUT + +##################################################################### +## Info + +echo +echo +echo +echo "------------------------------------------------------------------------" +echo "$PACKAGE $VERSION" +echo "------------------------------------------------------------------------" +echo +echo +echo "Configuration Options Summary:" +echo +echo " Documentation........: ${build_doc}" +echo " Unit Tests...........: ${enable_tests} (Coverage: ${efl_enable_coverage})" +echo " Examples.............: ${enable_build_examples}" +echo " Benchmark............: ${enable_benchmark}" +echo +echo "Compilation............: make (or gmake)" +echo " CPPFLAGS.............: $CPPFLAGS" +echo " CFLAGS...............: $CFLAGS" +echo " LDFLAGS..............: $LDFLAGS" +echo +echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" +echo " prefix...............: $prefix" +echo diff --git a/src/Makefile.am b/src/Makefile.am index 849ab41..b6a0867 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,18 +1,18 @@ -
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = lib benchmarks examples tests
-
-.PHONY: benchmark
-
-if EFL_ENABLE_BENCHMARK
-
-benchmark: all
- cd benchamrks && make eo_bench
-
-else
-
-benchmark:
- @echo "reconfigure with --enable-benchmark"
-
-endif
+ +MAINTAINERCLEANFILES = Makefile.in + +SUBDIRS = lib benchmarks examples tests + +.PHONY: benchmark + +if EFL_ENABLE_BENCHMARK + +benchmark: all + cd benchamrks && make eo_bench + +else + +benchmark: + @echo "reconfigure with --enable-benchmark" + +endif diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am index 2ee6cbb..a3a853e 100644 --- a/src/benchmarks/Makefile.am +++ b/src/benchmarks/Makefile.am @@ -1,26 +1,26 @@ -
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
-@EFL_EO_BUILD@ \
-@EO_CFLAGS@
-
-if EFL_ENABLE_BENCHMARK
-
-noinst_PROGRAMS = eo_bench
-
-eo_bench_SOURCES = \
-class_simple.c \
-class_simple.h \
-eo_bench.c \
-eo_bench.h \
-eo_bench_eo_do.c
-
-eo_bench_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
-
-endif
-
-clean-local:
- rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
+ +MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = \ +-I$(top_srcdir)/src/lib \ +-I$(top_builddir)/src/lib \ +@EFL_EO_BUILD@ \ +@EO_CFLAGS@ + +if EFL_ENABLE_BENCHMARK + +noinst_PROGRAMS = eo_bench + +eo_bench_SOURCES = \ +class_simple.c \ +class_simple.h \ +eo_bench.c \ +eo_bench.h \ +eo_bench_eo_do.c + +eo_bench_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@ + +endif + +clean-local: + rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 89fefd3..777891f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,19 +1,19 @@ -MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
-@EFL_EO_BUILD@ \
-@EO_CFLAGS@
-
-installed_headerdir = $(includedir)/eo-@VMAJ@
-dist_installed_header_DATA = Eo.h
-
-lib_LTLIBRARIES = libeo.la
-
-libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h
-libeo_la_LIBADD = @EO_LIBS@
-libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-
-clean-local:
- rm -rf *.gcno
+MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = \ +-I$(top_srcdir)/src/lib \ +-I$(top_builddir)/src/lib \ +@EFL_EO_BUILD@ \ +@EO_CFLAGS@ + +installed_headerdir = $(includedir)/eo-@VMAJ@ +dist_installed_header_DATA = Eo.h + +lib_LTLIBRARIES = libeo.la + +libeo_la_SOURCES = eo.c eo_base_class.c eo_private.h +libeo_la_LIBADD = @EO_LIBS@ +libeo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ + +clean-local: + rm -rf *.gcno |