diff --git a/INSTALL b/INSTALL index 007e939..3cbfe67 100644 --- a/INSTALL +++ b/INSTALL @@ -1,370 +1,60 @@ -Installation Instructions -************************* +** COMPILING and INSTALLING ** +------------------------------ -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. +Meson is the build system used for this project. For more information please +see: - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. + http://mesonbuild.com -Basic Installation -================== +---- - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. +Normal compilation in /usr/local: - 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, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). + meson . build + ninja -C build + sudo ninja -C build install - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. +For meson build generic options: - 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 you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. + meson --help - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. +For a list of project specific options supported: - The simplest way to compile this package is: + cat meson_options.txt - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. +To set 1 or more project specific options: - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. + meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build - 2. Type `make' to compile the package. +To display current configuration: - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. + mesonconf build - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. +The above will only work after at least the following is done: - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. + meson . build - 6. 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. +** QUICK AND DIRTY HELP ** +-------------------------- - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. +How clean out the build and config and start fresh: - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. + rm -rf build -Compilers and Options -===================== +How to make a dist tarball and check its build: +(must do it from git tree clone and commit all changes to git first) - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. + ninja -C build dist - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: +How to change prefix: - ./configure CC=c99 CFLAGS=-g LIBS=-lposix + meson --prefix=/path/to/prefix . build - *Note Defining Variables::, for more details. +How to install in a specific destination directory for packaging: -Compiling For Multiple Architectures -==================================== + DESTDIR=/path/to/destdir ninja -C build install - 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 can use 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 `..'. This -is known as a "VPATH" build. +How to build with verbose output (full commands run): - With a non-GNU `make', it is safer 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. + ninja -C build -v - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' 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. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - 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'. - - 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. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - 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 machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -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. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--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. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index f38f2f4..0000000 --- a/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -MAINTAINERCLEANFILES = \ - ABOUT-NLS \ - Makefile.in \ - aclocal.m4 \ - compile \ - config.guess \ - config.h.in \ - config.rpath \ - config.sub \ - configure \ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - m4/intl.m4 \ - m4/intldir.m4 \ - m4/intlmacosx.m4 \ - m4/libtool.m4 \ - m4/ltoptions.m4 \ - m4/ltsugar.m4 \ - m4/ltversion.m4 \ - m4/lt~obsolete.m4 \ - po/boldquot.sed \ - po/en@boldquot.header \ - po/en@quot.header \ - po/insert-header.sin \ - po/Makefile.in.in \ - po/Makevars.template \ - po/quot.sed \ - po/remove-potcdate.sin \ - po/Rules-quot \ - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \ - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 -if HAVE_FREEBSD -pkgconfigdir = $(libdir)data/pkgconfig -else -pkgconfigdir = $(libdir)/pkgconfig -endif - -pkgconfig_DATA = pc/edi.pc - -SUBDIRS = data doc packaging po src - -ACLOCAL_AMFLAGS = -I m4 - -filesdir = $(docdir) -files_DATA = \ - AUTHORS \ - COPYING \ - COPYING.LGPL \ - COPYING.GPLv2 \ - ChangeLog \ - INSTALL \ - NEWS \ - README \ - TODO - -EXTRA_DIST = \ - autogen.sh \ - COPYING.LGPL \ - COPYING.GPLv2 \ - config.rpath \ - configure \ - m4/efl_binary.m4 \ - m4/efl_compiler_flag.m4 \ - m4/efl_path_max.m4 - -if HAVE_PO -SUBDIRS += po -endif - -if EFL_HAVE_LCOV - -lcov-reset: - @rm -rf $(top_builddir)/coverage - @find $(top_builddir) -name "*.gcda" -delete - @lcov --zerocounters --directory $(top_builddir) - -lcov-report: - @mkdir $(top_builddir)/coverage - lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)/src/lib --base-directory $(top_srcdir)/src/lib - lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info - lcov --remove $(top_builddir)/coverage/coverage.cleaned.info '*/tests/*' --output-file $(top_builddir)/coverage/coverage.cleaned2.info - genhtml --branch-coverage -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned2.info - @echo "Coverage Report at $(top_builddir)/coverage/html" - -endif - -if EFL_HAVE_TESTS - -TESTS = src/tests/edi_suite - -lcov-check: -if EFL_HAVE_LCOV - @$(MAKE) $(AM_MAKEFLAGS) lcov-reset -endif - @$(MAKE) $(AM_MAKEFLAGS) check -if EFL_HAVE_LCOV - @$(MAKE) $(AM_MAKEFLAGS) lcov-report -endif - -endif - -# cleaning - -clean-local: - rm -rf benchmark coverage - diff --git a/Makefile_Edje_Helper.am b/Makefile_Edje_Helper.am deleted file mode 100644 index 3f05237..0000000 --- a/Makefile_Edje_Helper.am +++ /dev/null @@ -1,9 +0,0 @@ -EDJE_CC = @edje_cc@ -EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) -EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) -EDJE_CC_FLAGS_VERBOSE_1 = -v -EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -fastdecomp -id $(srcdir) -fd $(srcdir) - -AM_V_EDJ = $(am__v_EDJ_@AM_V@) -am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@) -am__v_EDJ_0 = @echo " EDJ " $@; diff --git a/Makefile_Eolian_Helper.am b/Makefile_Eolian_Helper.am deleted file mode 100644 index 377f173..0000000 --- a/Makefile_Eolian_Helper.am +++ /dev/null @@ -1,24 +0,0 @@ -if HAVE_EOLIAN_GEN -EOLIAN_GEN = @eolian_gen@ -_EOLIAN_GEN_DEP = @eolian_gen@ -else -EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} -_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT} -endif - -AM_V_EOL = $(am__v_EOL_@AM_V@) -am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) -am__v_EOL_0 = @echo " EOLIAN " $@; - -SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h - -%.eo.c: %.eo ${_EOLIAN_GEN_DEP} - $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $< - -%.eo.h: %.eo ${_EOLIAN_GEN_DEP} - $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $< - -%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP} - $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< - -CLEANFILES += $(BUILT_SOURCES) diff --git a/README b/README deleted file mode 100644 index 40eb3fd..0000000 --- a/README +++ /dev/null @@ -1,36 +0,0 @@ -EDI - The Enlightened IDE -=== - -This is a project to create a complete IDE using the EFL. -It aims to lower the barrier to getting involved in Enlightenment development -and in creating apps based on the EFL suite. - -Requirements ---- - -autotools -EFL & Elementary from git master (>= 1.14.99) -libclang-dev (or llvm-clang-devel) - -Installation ---- - -Using autotools to install this software is the usual: - -# ./autogen.sh -# make -# sudo make install - -Usage ---- - -After installing just launch - -# edi - -and it will prompt for a project (directory) location or you can specify like: - -# edi ~/Code/myproject - -to open the specified project. - diff --git a/README.md b/README.md index 0fee85d..5c5c7d0 100644 --- a/README.md +++ b/README.md @@ -9,17 +9,19 @@ and in creating apps based on the EFL suite. ## Requirements -autotools -EFL & Elementary from git master (>= 1.14.99) +meson +ninja +EFL from git master (>= 1.20.99) libclang-dev (or llvm-clang-devel) ## Installation -Using autotools to install this software is the usual: +Using meson and ninja to install this software is the usual: - ./autogen.sh - make - sudo make install + meson build/ + cd build + ninja + sudo ninja install ## Usage @@ -33,3 +35,8 @@ and it will prompt for a project (directory) location or you can specify like: to open the specified project. +Also included are handy utility apps that you can try + + edi_build + edi_scm + diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index fe644eb..0000000 --- a/autogen.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -rm -rf autom4te.cache -rm -f aclocal.m4 ltmain.sh - -echo "Running autopoint..." ; autopoint -f || : -echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1 -echo "Running autoconf..." ; autoconf || exit 1 -echo "Running autoheader..." ; autoheader || exit 1 -echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 -echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 - -if [ -z "$NOCONFIGURE" ]; then - ./configure "$@" -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 7c7d79a..0000000 --- a/configure.ac +++ /dev/null @@ -1,219 +0,0 @@ -EFL_VERSION([0], [6], [99]) -AC_INIT([edi], [efl_version], [enlightenment-devel@lists.sourceforge.net]) - -AC_PREREQ([2.65]) -AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_HEADERS([config.h]) - -AM_INIT_AUTOMAKE([1.10 dist-bzip2 -Wall color-tests subdir-objects]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - -### Additional options to configure - -# Check for tests and coverage -AC_ARG_WITH([tests], - [AS_HELP_STRING([--with-tests=none|tests|coverage], - [choose testing method: tests, coverage or none. - @<:@default=auto@:>@])], - [build_tests=${withval}], - [build_tests=auto]) - -# clang support -AC_ARG_ENABLE([libclang], - [AS_HELP_STRING([--disable-libclang], [Disable use of libclang. @<:@default=enable@:>@])], - [ - if test "x${enableval}" = "xyes" ; then - want_clang="yes" - else - want_clang="no" - fi - ], - [want_clang="yes"]) - -# Build EAR support -AC_ARG_ENABLE([bear], - [AS_HELP_STRING([--disable-bear], [Disable use of BuildEAR. @<:@default=enable@:>@])], - [ - if test "x${enableval}" = "xyes" ; then - want_bear="yes" - else - want_bear="no" - fi - ], - [want_bear="yes"]) - - - -### Checks for programs - -LT_PREREQ([2.2]) -LT_INIT([win32-dll pic-only]) -EFL_INIT - -AM_GNU_GETTEXT_VERSION([0.17]) -AM_GNU_GETTEXT([external]) -po_makefile_in=po/Makefile.in -have_po="yes" - -AC_SUBST([LTLIBINTL]) -if test "x$LIBINTL" = "x"; then - LIBINTL="$INTLLIBS" -fi - -if test "x${POSUB}" = "x" ; then - have_po="no" -fi - -AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) - -# if cross compiling, disable NLS support. -# It's not worth the trouble, at least for now. -if test "x$cross_compiling" = xyes; then - enable_nls=no -fi - -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - -AC_PROG_CC - -PKG_PROG_PKG_CONFIG - -EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) - - -### Checks for libraries - -requirements_pc_edi="eina >= 1.19.0 evas >= 1.19.0 ecore >= 1.19.0 edje >= 1.19.0 eo >= 1.19.0 elementary >= 1.20.0 eio >= 1.19.0" -AC_SUBST([requirements_pc_edi]) -PKG_CHECK_MODULES([EFL], [${requirements_pc_edi}]) - -# Check edje_cc -EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) -EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen]) -# Force the helper to try external eolian generators -AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true]) - -AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"]) - -# Needs to be moved into a macro, and also, needs a way to automatically fetch -# from all the dependencies using the Requires. -DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje efl elementary` -AC_SUBST([DEPS_EOLIAN_FLAGS]) - - -### Checks for header files - - -### Checks for types - - -### Checks for structures - - -### Checks for compiler characteristics - -AM_PROG_CC_C_O - -EFL_CHECK_PATH_MAX -EFL_COMPILER_FLAG([-Wall]) -EFL_COMPILER_FLAG([-Wextra]) -EFL_COMPILER_FLAG([-fvisibility=hidden]) - - -### Checks for linker characteristics - - -### Checks for library functions - -AC_CHECK_FUNCS([setlocale]) - -# this will speed up libtool checks - - -# Checks for header files. - -have_clang="no" -if test "${want_clang}" = "yes"; then - AC_CHECK_HEADERS([clang-c/Index.h], [have_clang="yes"], [have_clang="no"]) -fi - -if test "${want_bear}" = "yes"; then - AC_CHECK_PROG([have_bear], [bear], [yes], [no]) -fi - -EFL_TESTS([${build_tests}]) - -# Checks for library functions. - -if test "${have_clang}" = "yes"; then - ldflags="$LDFLAGS" - LDFLAGS+=" -L${libdir}/llvm" - AC_CHECK_LIB([clang], [clang_Cursor_getArgument], - [ - AC_DEFINE([HAVE_LIBCLANG], [1], [Set to 1 if clang is found]) - EFL_LIBS="${EFL_LIBS} -lclang" - ], - [have_clang="no"]) -fi - -if test "${have_clang}" = "no"; then - AC_MSG_WARN([Could not find a usable libclang. Please install libclang to enable syntax highlighting features.]) -fi -CLANG_INCLUDE=`clang -E - -v < /dev/null 2>&1 | grep "^ /usr" | grep clang` -AC_SUBST([CLANG_INCLUDE]) - -BEAR_COMMAND="" -if test "${have_bear}" = "no"; then - AC_MSG_WARN([Could not find a usable bear command. Please install bear (BuildEAR) to enable better support for complex make projects.]) -else - BEAR_COMMAND="bear" -fi -AC_SUBST([BEAR_COMMAND]) - -AC_CONFIG_FILES([ -Makefile -data/Makefile -data/images/Makefile -data/desktop/Makefile -data/desktop/edi.desktop -data/themes/Makefile -data/themes/default/Makefile -data/extra/Makefile -data/extra/templates/Makefile -doc/Makefile -packaging/Makefile -packaging/pkgbuild/Makefile -po/Makefile.in -src/Makefile -src/bin/Makefile -src/lib/Makefile -src/tests/Makefile -doc/edi.1 -pc/edi.pc -]) -AC_OUTPUT - -echo -echo -echo "------------------------------------------------------------------------" -echo "$PACKAGE_NAME $PACKAGE_VERSION" -echo "------------------------------------------------------------------------" -echo -echo "Compilation..............: make (or gmake)" -echo " CPPFLAGS...............: $CPPFLAGS" -echo " CFLAGS.................: $CFLAGS" -echo " LDFLAGS................: $LDFLAGS" -echo " edje_cc................: ${edje_cc}" -echo " highlighting (libclang): ${have_clang}" -echo " make command db (bear).: ${have_bear}" -echo -echo "eolian_gen...............: ${eolian_gen}" -echo -echo "Building documentation...: ${build_doc}" -echo "Building tests...........: ${have_tests}" -echo "Generate coverage .......: ${have_lcov}" -echo -echo "Installation.............: make install (as root if needed, with 'su' or 'sudo')" -echo " prefix.................: $prefix" -echo diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index dd24a8f..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = themes desktop images extra - diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am deleted file mode 100644 index 8c6e0b1..0000000 --- a/data/desktop/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -desktopdir = $(datadir)/applications -desktop_DATA = edi.desktop - -icondir = $(datadir)/icons/hicolor/256x256/apps -icon_DATA = edi.png - -EXTRA_DIST = $(desktop_DATA) $(icon_DATA) diff --git a/data/extra/Makefile.am b/data/extra/Makefile.am deleted file mode 100644 index e935538..0000000 --- a/data/extra/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = templates - diff --git a/data/extra/templates/Makefile.am b/data/extra/templates/Makefile.am deleted file mode 100644 index f363ac5..0000000 --- a/data/extra/templates/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -templatesdir = $(datadir)/$(PACKAGE)/templates -skeletonsdir = $(datadir)/$(PACKAGE)/templates/skeletons -templatessrcdir = $(top_srcdir)/data/extra/templates - -templates_DATA = \ -eflproject.edj \ -eflproject_python.edj - -skeletons_DATA = \ -eflproject.tar.gz \ -eflproject_python.tar.gz - -eflproject.tar.gz: - tar zcvf eflproject.tar.gz -C $(templatessrcdir)/skeletons eflproject - -eflproject_python.tar.gz: - tar zcvf eflproject_python.tar.gz -C $(templatessrcdir)/skeletons eflproject_python - -eflproject.edj: - edje_cc -id $(templatessrcdir)/images/ $(templatessrcdir)/eflproject.edc - -eflproject_python.edj: - edje_cc -id $(templatessrcdir)/images/ $(templatessrcdir)/eflproject_python.edc - -EXTRA_DIST = $(templates_DATA) $(skeletons_DATA) diff --git a/data/images/Makefile.am b/data/images/Makefile.am deleted file mode 100644 index 126fcf7..0000000 --- a/data/images/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -imagesdir = $(datadir)/$(PACKAGE)/images -images_DATA = \ -about.png \ -welcome.png - -EXTRA_DIST = $(images_DATA) diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am deleted file mode 100644 index 31a2b40..0000000 --- a/data/themes/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = default - diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am deleted file mode 100644 index 2612ac0..0000000 --- a/data/themes/default/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = \ -default.edc \ -images/enlightenment.png \ -sounds/bell.wav - -include ../../../Makefile_Edje_Helper.am - -filesdir = $(datadir)/$(PACKAGE)/themes -files_DATA = default.edj - -default.edj: Makefile $(EXTRA_DIST) - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \ - -id ${top_srcdir}/data/themes/default/images \ - -sd ${top_srcdir}/data/themes/default/sounds \ - $(top_srcdir)/data/themes/default/default.edc \ - $(top_builddir)/data/themes/default/default.edj - -clean-local: - rm -f *.edj diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 97ec67f..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = edi.1.in - -man_MANS = edi.1 - - -.PHONY: doc - -PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc - -if EFL_BUILD_DOC - -doc-clean: - rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* - -doc: all - $(efl_doxygen) - cp $(srcdir)/img/* html/ - cp $(srcdir)/img/*.eps latex/ - rm -rf $(PACKAGE_DOCNAME).tar* - mkdir -p $(PACKAGE_DOCNAME)/doc - cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc - tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ - bzip2 -9 $(PACKAGE_DOCNAME).tar - rm -rf $(PACKAGE_DOCNAME)/ - mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) - @echo "Documentation Package: doc/$(PACKAGE_DOCNAME).tar.bz2" - @echo "Documentation HTML: doc/html" - -clean-local: doc-clean - -else - -doc: - @echo "Documentation not built. Run ./configure --help" - -endif - diff --git a/m4/efl.m4 b/m4/efl.m4 deleted file mode 100644 index 098722f..0000000 --- a/m4/efl.m4 +++ /dev/null @@ -1,123 +0,0 @@ -dnl file to manage modules in efl - -dnl EFL_VERSION(major, minor, micro, release) -dnl This setup EFL version information and should be called BEFORE AC_INIT(). -dnl -dnl release parameter is 'dev' to use from SVN or libtool -release field. -dnl It may be empty if not dev (svn/live build) and no -release is to be used. -dnl -dnl Examples: -dnl EFL_VERSION(1, 7, 99, dev) -dnl EFL_VERSION(1, 7, 99, ver-1234) -dnl This will define couple of m4 symbols: -dnl v_maj = given major number (first parameter) -dnl v_min = given minor number (second parameter) -dnl v_mic = given micro number (third parameter) -dnl v_rev = if release, it's 0, otherwise it's dev_version. -dnl v_rel = if release, it's -release followed by fourth parameter, -dnl otherwise it's empty. (mostly for libtool) -dnl efl_version = if release, it's major.minor.micro, otherwise it's -dnl major.minor.micro.dev_version -dnl dev_version = development version (svn revision). -dnl def_build_profile = dev or release based on 'dev' release parameter. -AC_DEFUN([EFL_VERSION], -[dnl -m4_define([v_maj], [$1])dnl -m4_define([v_min], [$2])dnl -m4_define([v_mic], [$3])dnl -m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl -m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl -m4_define([v_rel], [])dnl -m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl -m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl -m4_define([efl_version], [v_maj.v_min.v_mic])dnl -]) - -dnl EFL_COLOR -dnl will check if terminal supports color and if color is wanted by user. -dnl -dnl Used Variables: -dnl WANT_COLOR: if no, forces no color output. -dnl TERM: used to check if color should be enabled. -dnl -dnl Defined Variables: -dnl COLOR_YES: to be used in positive/yes conditions -dnl COLOR_NO: to be used in negative/no conditions -dnl COLOR_OTHER: to be used to highlight some other condition -dnl COLOR_RESET: to reset color -dnl want_color: yes or no -AC_DEFUN([EFL_COLOR], -[dnl -case "$TERM" in - xterm|xterm-color|xterm-256color|Eterm|aterm|kterm|rxvt*|screen|gnome|interix) - want_color="${WANT_COLOR:-yes}" - ;; - *) - want_color="no" - ;; -esac - -if test "${want_color}" = "yes"; then - if test `echo -e x` = x; then - echoopt=-e - else - echoopt= - fi - - COLOR_YES=`echo $echoopt "\033@<:@1;32m"` - COLOR_NO=`echo $echoopt "\033@<:@1;31m"` - COLOR_OTHER=`echo $echoopt "\033@<:@1;36m"` - COLOR_RESET=`echo $echoopt "\033@<:@0m"` - -else - COLOR_YES="" - COLOR_NO="" - COLOR_OTHER="" - COLOR_RESET="" -fi -]) - -dnl EFL_INIT() -dnl Will AC_DEFINE() the following: -dnl VMAJ = v_maj -dnl VMIN = v_min -dnl VMIC = v_mic -dnl VREV = v_rev -dnl Will AC_SUBST() the following: -dnl VMAJ = v_maj -dnl VMIN = v_min -dnl VMIC = v_mic -dnl EFL_LTLIBRARY_FLAGS="-no-undefined -version-info ..." -dnl EFL_LTMODULE_FLAGS="-no-undefined -avoid-version" -dnl Will define the following m4: -dnl lt_cur = libtool 'current' field of libtool's -version-info -dnl lt_rev = libtool 'revision' field of libtool's -version-info -dnl lt_age = libtool 'age' field of libtool's -version-info -AC_DEFUN([EFL_INIT], -[dnl -AC_REQUIRE([EFL_COLOR])dnl -AC_DEFINE_UNQUOTED([VMAJ], [v_maj], [Major version])dnl -AC_DEFINE_UNQUOTED([VMIN], [v_min], [Minor version])dnl -AC_DEFINE_UNQUOTED([VMIC], [v_mic], [Micro version])dnl -AC_DEFINE_UNQUOTED([VREV], [v_rev], [Revison])dnl -VMAJ=v_maj -VMIN=v_min -VMIC=v_mic -AC_SUBST([VMAJ])dnl -AC_SUBST([VMIN])dnl -AC_SUBST([VMIC])dnl -dnl -dnl TODO: warning - lt_cur: -dnl the previous code assumed v_maj + v_min, but this will be a problem when -dnl we bump v_maj and reset v_min. 1 + 7 == 7 + 1, so if v_maj is bumped -dnl we multiply it by 100. -m4_define([lt_cur], m4_if(m4_cmp(v_maj, 1), 0, m4_eval(v_maj + v_min), m4_eval(v_maj * 100 + v_min)))dnl -m4_define([lt_rev], v_mic)dnl -m4_define([lt_age], v_min)dnl -dnl -EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel" -AC_SUBST(EFL_LTLIBRARY_FLAGS)dnl -EFL_LTMODULE_FLAGS="-no-undefined -avoid-version" -AC_SUBST([EFL_LTMODULE_FLAGS])dnl -AC_MSG_NOTICE([Initialized AC_PACKAGE_NAME (AC_PACKAGE_VERSION) development=dev_version v_rel]) -]) diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4 deleted file mode 100644 index 91a26b2..0000000 --- a/m4/efl_binary.m4 +++ /dev/null @@ -1,79 +0,0 @@ -dnl Copyright (C) 2010 Vincent Torri -dnl That code is public domain and can be freely used or copied. - -dnl Macro that check if a binary is built or not - -dnl Usage: EFL_ENABLE_BIN(binary) -dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _) -dnl Define have_binary (- is transformed into _) -dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being transformed into _) - -AC_DEFUN([EFL_ENABLE_BIN], -[ - -m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl -m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl - -have_[]m4_defn([DOWN])="yes" - -dnl configure option - -AC_ARG_ENABLE([$1], - [AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)], - [ - if test "x${enableval}" = "xyes" ; then - have_[]m4_defn([DOWN])="yes" - else - have_[]m4_defn([DOWN])="no" - fi - ]) - -AC_MSG_CHECKING([whether to build ]DOWN[ binary]) -AC_MSG_RESULT([$have_[]m4_defn([DOWN])]) - -if test "x$have_[]m4_defn([DOWN])" = "xyes"; then - UP[]_PRG=DOWN[${EXEEXT}] -fi - -AC_SUBST(UP[]_PRG) - -AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes") - -AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3]) - -]) - - -dnl Macro that check if a binary is built or not - -dnl Usage: EFL_WITH_BIN(package, binary, default_value) -dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user) - -AC_DEFUN([EFL_WITH_BIN], -[ - -m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl -m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl - -dnl configure option - -AC_ARG_WITH([$2], - [AC_HELP_STRING([--with-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=$3@:>@])], - [ - _efl_with_binary=${withval} - _efl_binary_define="yes" - ], - [ - _efl_with_binary=$(pkg-config --variable=prefix $1)/bin/$3 - _efl_binary_define="no" - ]) - -DOWN=${_efl_with_binary} -AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}]) - -with_binary_[]m4_defn([DOWN])=${_efl_with_binary} - -AM_CONDITIONAL(HAVE_[]UP, [test "x${_efl_binary_define}" = "xyes"]) -AC_SUBST(DOWN) - -]) diff --git a/m4/efl_compiler_flag.m4 b/m4/efl_compiler_flag.m4 deleted file mode 100644 index 25c285d..0000000 --- a/m4/efl_compiler_flag.m4 +++ /dev/null @@ -1,57 +0,0 @@ -dnl Copyright (C) 2010 Vincent Torri -dnl and Albin Tonnerre -dnl That code is public domain and can be freely used or copied. - -dnl Macro that checks if a compiler flag is supported by the compiler. - -dnl Usage: EFL_COMPILER_FLAG(flag) -dnl flag is added to CFLAGS if supported. - -AC_DEFUN([EFL_COMPILER_FLAG], -[ - -CFLAGS_save="${CFLAGS}" -CFLAGS="${CFLAGS} $1" - -AC_LANG_PUSH([C]) -AC_MSG_CHECKING([whether the compiler supports $1]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]])], - [have_flag="yes"], - [have_flag="no"]) -AC_MSG_RESULT([${have_flag}]) - -if test "x${have_flag}" = "xno" ; then - CFLAGS="${CFLAGS_save}" -fi -AC_LANG_POP([C]) - -]) - -dnl Macro that checks if a linker flag is supported by the compiler. - -dnl Usage: EFL_LINKER_FLAG(flag) -dnl flag is added to LDFLAGS if supported (will be passed to ld anyway). - -AC_DEFUN([EFL_LINKER_FLAG], -[ - -LDFLAGS_save="${LDFLAGS}" -LDFLAGS="${LDFLAGS} $1" - -AC_LANG_PUSH([C]) -AC_MSG_CHECKING([whether the compiler supports $1]) - -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]])], - [have_flag="yes"], - [have_flag="no"]) -AC_MSG_RESULT([${have_flag}]) - -if test "x${have_flag}" = "xno" ; then - LDFLAGS="${LDFLAGS_save}" -fi -AC_LANG_POP([C]) - -]) diff --git a/m4/efl_doxygen.m4 b/m4/efl_doxygen.m4 deleted file mode 100644 index 0c1452f..0000000 --- a/m4/efl_doxygen.m4 +++ /dev/null @@ -1,98 +0,0 @@ -dnl Copyright (C) 2008 Vincent Torri -dnl That code is public domain and can be freely used or copied. - -dnl Macro that check if doxygen is available or not. - -dnl EFL_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for the doxygen program -dnl Defines efl_doxygen -dnl Defines the automake conditionnal EFL_BUILD_DOC -dnl -AC_DEFUN([EFL_CHECK_DOXYGEN], -[ - -dnl -dnl Disable the build of the documentation -dnl -AC_ARG_ENABLE([doc], - [AC_HELP_STRING( - [--disable-doc], - [Disable documentation build @<:@default=enabled@:>@])], - [ - if test "x${enableval}" = "xyes" ; then - efl_enable_doc="yes" - else - efl_enable_doc="no" - fi - ], - [efl_enable_doc="yes"] -) - -if test "x${efl_enable_doc}" = "xyes" ; then - -dnl -dnl Specify the full file name, with path -dnl - - efl_doxygen="doxygen" - - AC_ARG_WITH([doxygen], - [AC_HELP_STRING( - [--with-doxygen=FILE], - [doxygen program to use @<:@default=doxygen@:>@])], -dnl -dnl Check the given doxygen program. -dnl - [efl_doxygen=${withval} - AC_CHECK_PROG([efl_have_doxygen], - [${efl_doxygen}], - [yes], - [no]) - if test "x${efl_have_doxygen}" = "xno" ; then - echo "WARNING:" - echo "The doxygen program you specified:" - echo "$efl_doxygen" - echo "was not found. Please check the path and make sure " - echo "the program exists and is executable." - AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) - fi - ], - [AC_CHECK_PROG([efl_have_doxygen], - [${efl_doxygen}], - [yes], - [no]) - if test "x${efl_have_doxygen}" = "xno" ; then - echo "WARNING:" - echo "The doxygen program was not found in your execute" - echo "You may have doxygen installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the doxygen program is in your execute path (see your" - echo "shell manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the program to use with --with-doxygen." - AC_MSG_WARN([Warning: no doxygen detected. Documentation will not be built]) - fi - ] - ) -fi - -dnl -dnl Substitution -dnl -AC_SUBST([efl_doxygen]) - -if ! test "x${efl_have_doxygen}" = "xyes" ; then - efl_enable_doc="no" -fi - -AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_enable_doc}" = "xyes") - -if test "x${efl_enable_doc}" = "xyes" ; then - ifelse([$1], , :, [$1]) -else - ifelse([$2], , :, [$2]) -fi - -]) - -dnl End of doxygen.m4 diff --git a/m4/efl_path_max.m4 b/m4/efl_path_max.m4 deleted file mode 100644 index f57bfd2..0000000 --- a/m4/efl_path_max.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl Check for PATH_MAX in limits.h, and define a default value if not found -dnl This is a workaround for systems not providing PATH_MAX, like GNU/Hurd - -dnl EFL_CHECK_PATH_MAX([DEFAULT_VALUE_IF_NOT_FOUND]) -dnl -dnl If PATH_MAX is not defined in , defines it -dnl to DEFAULT_VALUE_IF_NOT_FOUND if it exists, or fallback -dnl to using 4096 - -AC_DEFUN([EFL_CHECK_PATH_MAX], -[ - -default_max=m4_default([$1], "4096") -AC_LANG_PUSH([C]) - -AC_MSG_CHECKING([for PATH_MAX in limits.h]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include - ]], - [[ -int i = PATH_MAX; - ]])], - [AC_MSG_RESULT([yes])], - [ - AC_DEFINE_UNQUOTED([PATH_MAX], - [${default_max}], - [default value since PATH_MAX is not defined]) - AC_MSG_RESULT([no: using ${default_max}]) - ]) - -AC_LANG_POP([C]) - -]) -dnl end of efl_path_max.m4 diff --git a/m4/efl_tests.m4 b/m4/efl_tests.m4 deleted file mode 100644 index 2b6106c..0000000 --- a/m4/efl_tests.m4 +++ /dev/null @@ -1,65 +0,0 @@ -dnl Copyright (C) 2013 Cedric BAIL -dnl That code is public domain and can be freely used or copied. - -dnl Macro for checking availability of tests and coverage infra structure - -dnl Usage: EFL_TESTS(profile) -dnl Valid profile are auto, tests, coverage, no -dnl Call PKG_CHECK_MODULES, AC_CHECK_PROG, define CHECK_CFLAGS/CHECK_LIBS and modify CFLAGS/LIBS -dnl It define EFL_HAVE_TESTS/EFL_HAVE_LCOV for use in Makefile.am -dnl It set have_test and have_coverage to yes/no depending if found - -AC_DEFUN([EFL_TESTS], -[ -build_tests=$1 - -case "${build_tests}" in - auto) - check_tests="auto" - check_coverage="auto" - ;; - tests) - check_tests="yes" - check_coverage="auto" - ;; - coverage) - check_tests="yes" - check_coverage="yes" - ;; - no) - check_tests="no" - check_coverage="no" - ;; - *) - AC_MSG_ERROR([Unknow tests profile]) -esac - -have_tests="no" -if test "x${check_tests}" = "xyes" -o "x${check_tests}" = "xauto"; then - PKG_CHECK_MODULES([CHECK], [check >= 0.9.5], [have_tests="yes"], [have_tests="no"]) - if test "${check_tests}" = "xyes" -a "x${have_tests}" = "xno"; then - AC_MSG_ERROR([Impossible to find check package to build tests]) - fi -fi - -if test "x${have_tests}" = "xyes"; then - if test "x${check_coverage}" = "xyes" -o "x${check_coverage}" = "xauto"; then - AC_CHECK_PROG([have_lcov], [lcov], [yes], [no]) - if test "x${have_lcov}" = "xyes" ; then - CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage" - LIBS="${LIBS} -lgcov" - fi - if test "x${have_lcov}" = "xno" -a "x${check_coverage}" = "xyes"; then - AC_MSG_ERROR([Impossible to find lcov package to build with coverage support]) - fi - else - have_coverage="no" - fi -else - have_coverage="no" -fi - -AM_CONDITIONAL([EFL_HAVE_TESTS], [test "x${have_tests}" = "xyes"]) -AM_CONDITIONAL([EFL_HAVE_LCOV], [test "x${have_lcov}" = "xyes"]) - -]) diff --git a/packaging/Makefile.am b/packaging/Makefile.am deleted file mode 100644 index 5b6b52a..0000000 --- a/packaging/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = pkgbuild - diff --git a/packaging/pkgbuild/Makefile.am b/packaging/pkgbuild/Makefile.am deleted file mode 100644 index c1675ad..0000000 --- a/packaging/pkgbuild/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = PKGBUILD diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 15871c9..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = lib bin tests - diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am deleted file mode 100644 index aa32e74..0000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -AUTOMAKE_OPTIONS = subdir-objects - -bin_PROGRAMS = edi edi_build edi_scm -efl_cflags_safe = '@EFL_CFLAGS@' -clang_include = '$(CLANG_INCLUDE)' - -AM_CPPFLAGS = \ --DPACKAGE_BIN_DIR=\"$(bindir)\" \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ --DPACKAGE_DOC_DIR=\"$(docdir)\" \ --DVERSION=\"$(PACKAGE_VERSION)\" \ --DLOCALEDIR=\"$(datadir)/locale\" \ --I$(top_srcdir)/src/lib \ --I$(top_srcdir)/src/bin \ --I$(top_builddir)/src/lib \ --DEFL_BETA_API_SUPPORT \ --DEFL_CFLAGS=\"$(efl_cflags_safe)\" \ --DCLANG_INCLUDES=\"-I$(clang_include)\" \ -@EFL_CFLAGS@ - -noinst_HEADERS = \ -edi_config.h \ -language/edi_language_provider.h \ -editor/edi_editor.h \ -edi_content_provider.h \ -screens/edi_screens.h \ -screens/edi_file_screens.h \ -edi_filepanel.h \ -edi_file.h \ -edi_scm_ui.h \ -edi_logpanel.h \ -edi_searchpanel.h \ -edi_consolepanel.h \ -edi_debugpanel.h \ -mainview/edi_mainview_item.h \ -mainview/edi_mainview_panel.h \ -mainview/edi_mainview.h - -edi_SOURCES = \ -edi_config.c \ -language/edi_language_provider.c \ -editor/edi_editor_search.c \ -editor/edi_editor.c \ -editor/edi_editor_documentation.c \ -edi_content_provider.c \ -screens/edi_welcome.c \ -screens/edi_about.c \ -screens/edi_settings_font.c \ -screens/edi_settings.c \ -screens/edi_file_screens.c \ -screens/edi_screens.c \ -edi_filepanel.c \ -edi_file.c \ -edi_scm_ui.c \ -edi_logpanel.c \ -edi_searchpanel.c \ -edi_consolepanel.c \ -edi_debugpanel.c \ -mainview/edi_mainview_item.c \ -mainview/edi_mainview_panel.c \ -mainview/edi_mainview.c \ -edi_main.c \ -edi_private.h - -EXTRA_DIST = \ -language/edi_language_provider_c.c \ -language/edi_language_provider_python.c \ -language/edi_language_provider_rust.c - -edi_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la $(LTLIBINTL) - -edi_build_SOURCES = \ -edi_build_main.c -edi_build_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la - -edi_scm_SOURCES = \ -edi_scm_ui.c \ -edi_scm_main.c -edi_scm_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am deleted file mode 100644 index 859af21..0000000 --- a/src/lib/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = \ --I$(top_srcdir)/src/lib \ --I$(top_builddir)/src/lib \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@EFL_CFLAGS@ \ --DEFL_EDI_BUILD \ --DBEAR_COMMAND=\"$(BEAR_COMMAND)\" - -lib_LTLIBRARIES = libedi.la - -includes_HEADERS = \ -edi_build_provider.h \ -edi_builder.h \ -edi_create.h \ -edi_path.h \ -edi_exe.h \ -edi_scm.h \ -Edi.h -includesdir = $(includedir)/edi-@VMAJ@ - -libedi_la_SOURCES = \ -edi_private.h \ -edi_build_provider_make.c \ -edi_build_provider_cmake.c \ -edi_build_provider_cargo.c \ -edi_build_provider_python.c \ -edi_build_provider_meson.c \ -edi_build_provider.c \ -edi_builder.c \ -edi_create.c \ -edi_path.c \ -md5.h \ -md5.c \ -edi_scm.c \ -edi_exe.c \ -edi.c -libedi_la_LIBADD = @EFL_LIBS@ -lm -libedi_la_LDFLAGS = -no-undefined @EFL_LTLIBRARY_FLAGS@ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am deleted file mode 100644 index 2ff571b..0000000 --- a/src/tests/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -CLEANFILES = check-results.xml - -if EFL_HAVE_TESTS - -check_PROGRAMS = edi_suite -efl_cflags_safe = '@EFL_CFLAGS@' -clang_include = '$(CLANG_INCLUDE)' - -edi_suite_SOURCES = \ -edi_test_path.c \ -edi_test_create.c \ -edi_test_exe.c \ -edi_test_content_provider.c \ -edi_test_language_provider.c \ -edi_test_language_provider_c.c \ -edi_suite.c - -edi_suite_CPPFLAGS = -I$(top_builddir)/src/lib/ -I$(top_builddir)/src/bin/ \ --I$(top_srcdir)/src/lib \ --I$(top_srcdir)/src/bin \ --DPACKAGE_TESTS_DIR=\"`pwd`/$(top_srcdir)/src/tests/\" \ --DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/\" \ --DEFL_BETA_API_SUPPORT \ --DEFL_CFLAGS=\"$(efl_cflags_safe)\" \ --DCLANG_INCLUDES=\"$(clang_include)\" \ -@EFL_CFLAGS@ \ -@CHECK_CFLAGS@ - -edi_suite_LDADD = @EFL_LIBS@ @CHECK_LIBS@ $(top_builddir)/src/lib/libedi.la -edi_suite_DEPENDENCIES = $(top_builddir)/src/lib/libedi.la - -endif - -EXTRA_DIST = edi_suite.h