bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/apps/extra.git/commit/?id=5b43a74c6dd8c14548fb8addf9ae72d8be18fb8d
commit 5b43a74c6dd8c14548fb8addf9ae72d8be18fb8d Author: Marcel Hollerbach <[email protected]> Date: Sun Mar 22 11:00:16 2020 +0100 extra: remove autotools due to the fact, that the packaging subdir was only working with autotools, that is also removed. --- Makefile.am | 91 -------------------------- Makefile_Edje_Helper.am | 9 --- autogen.sh | 23 ------- configure.ac | 101 ---------------------------- data/Makefile.am | 3 - data/desktop/Makefile.am | 9 --- doc/Makefile.am | 38 ----------- m4/efl.m4 | 123 ----------------------------------- m4/efl_attribute.m4 | 56 ---------------- m4/efl_binary.m4 | 79 ---------------------- m4/efl_compiler_flag.m4 | 57 ---------------- m4/efl_doxygen.m4 | 98 ---------------------------- m4/efl_path_max.m4 | 36 ---------- m4/efl_tests.m4 | 65 ------------------ packaging/Makefile.am | 4 -- packaging/pkgbuild/Makefile.am | 3 - packaging/pkgbuild/PKGBUILD | 59 ----------------- packaging/slackware/Makefile.am | 4 -- packaging/slackware/doinst.sh | 1 - packaging/slackware/extra.SlackBuild | 106 ------------------------------ packaging/slackware/slack-desc | 19 ------ packaging/slackware/slack-required | 5 -- src/Makefile.am | 4 -- src/bin/Makefile.am | 23 ------- src/lib/Makefile.am | 24 ------- src/tests/Makefile.am | 17 ----- 26 files changed, 1057 deletions(-) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 11cc3a5..0000000 --- a/Makefile.am +++ /dev/null @@ -1,91 +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/libtool.m4 \ - m4/ltoptions.m4 \ - m4/ltsugar.m4 \ - m4/ltversion.m4 \ - m4/lt~obsolete.m4 \ - po/boldquot.sed \ - po/[email protected] \ - po/[email protected] \ - 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 - -SUBDIRS = data doc packaging po src - -ACLOCAL_AMFLAGS = -I m4 - -filesdir = $(docdir) -files_DATA = \ - AUTHORS \ - COPYING \ - ChangeLog \ - INSTALL \ - NEWS \ - README \ - TODO - -EXTRA_DIST = \ - autogen.sh \ - config.rpath \ - configure \ - m4/efl_attribute.m4 \ - m4/efl_binary.m4 \ - m4/efl_compiler_flag.m4 \ - m4/efl_path_max.m4 - -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/extra_tests - -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/autogen.sh b/autogen.sh deleted file mode 100755 index 1762b7d..0000000 --- a/autogen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -rm -rf autom4te.cache -rm -f aclocal.m4 ltmain.sh - -if [ -d ".git" ]; then - echo "Getting all submodules" - if [ $(git submodule status | cut -c1 | grep "-") ]; then - echo "A few submodules are not initializied." - echo "Calling 'git submodule update --init --recursive'" - git submodule update --init --recursive - fi -fi -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 2c574dc..0000000 --- a/configure.ac +++ /dev/null @@ -1,101 +0,0 @@ -EFL_VERSION([0], [0], [1], [dev]) -AC_INIT([extra], [efl_version], [[email protected]]) - -AC_PREREQ([2.65]) -AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_HEADERS([config.h]) - -AC_CANONICAL_BUILD -AC_CANONICAL_HOST - -AM_INIT_AUTOMAKE([1.10 dist-bzip2 -Wall color-tests]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_PROG_AR - -# this will speed up libtool checks -LT_PREREQ([2.2]) -LT_INIT([win32-dll pic-only]) -EFL_INIT - -AC_PROG_CC -AC_PROG_CC_C99 -AM_PROG_CC_C_O -EFL_ATTRIBUTE_UNUSED -EFL_COMPILER_FLAG([-Wall]) -EFL_COMPILER_FLAG([-W]) - -# Checks for header files. -EFL_CHECK_PATH_MAX - -# Check for EFL -PKG_CHECK_MODULES([EFL], -[ - eina >= 1.8.0 - evas >= 1.8.0 - ecore >= 1.8.0 - edje >= 1.8.0 - elementary >= 1.8.0 -]) - -# Check for tests and coverage -AC_ARG_WITH([tests], - [AC_HELP_STRING([--with-tests=none|regular|coverage], - [choose testing method: regular, coverage or none. - @<:@default=no@:>@])], - [build_tests=${withval}], - [build_tests=no]) - -EFL_TESTS([${build_tests}]) - -# doxygen program for documentation building -EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) - -# Check edje_cc -EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) - -# Checks for library functions. -AC_CHECK_FUNCS([setlocale]) - -AM_GNU_GETTEXT_VERSION([0.17]) -AM_GNU_GETTEXT([external]) - -AC_CHECK_FILE("${srcdir}/src/lib/jsmn/jsmn.c",[],[ -echo "You have to do 'git submodule update --init --recursive' to have the complete sourcecode." -exit; -]) - -AC_CONFIG_FILES([ -Makefile -data/Makefile -data/desktop/Makefile -data/desktop/extra.desktop -doc/Makefile -packaging/Makefile -packaging/slackware/Makefile -packaging/pkgbuild/Makefile -po/Makefile.in -src/Makefile -src/bin/Makefile -src/lib/Makefile -src/tests/Makefile -doc/extra.1 -]) -AC_OUTPUT - -echo -echo -echo "------------------------------------------------------------------------" -echo "$PACKAGE_NAME $PACKAGE_VERSION" -echo "------------------------------------------------------------------------" -echo -echo "Compilation..............: make (or gmake)" -echo " CFLAGS.................: $CFLAGS" -echo " edje_cc................: ${edje_cc}" -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 3351d18..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = desktop diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am deleted file mode 100644 index 1ab7c9c..0000000 --- a/data/desktop/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -desktopdir = $(datadir)/applications -desktop_DATA = extra.desktop - -icondir = $(datadir)/icons -icon_DATA = extra.png - -EXTRA_DIST = $(desktop_DATA) $(icon_DATA) diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index a9ca5ba..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = extra.1.in - -man_MANS = extra.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_attribute.m4 b/m4/efl_attribute.m4 deleted file mode 100644 index 78bff15..0000000 --- a/m4/efl_attribute.m4 +++ /dev/null @@ -1,56 +0,0 @@ -dnl Copyright (C) 2011 Vincent Torri <vtorri at univ-evry dot fr> -dnl That code is public domain and can be freely used or copied. - -dnl Macros for checking if the compiler supports some __attribute__ uses - -dnl Usage: EFL_ATTRIBUTE_UNUSED -dnl call AC_DEFINE for __UNUSED__ if __attribute__((unused)) is available - -AC_DEFUN([EFL_ATTRIBUTE_UNUSED], -[ -AC_MSG_CHECKING([for __attribute__ ((unused))]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -void foo(int x __attribute__ ((unused))) {} - ]], - [[ - ]])], - [have_attribute_unused="yes"], - [have_attribute_unused="no"]) -AC_MSG_RESULT([${have_attribute_unused}]) - -if test "x${have_attribute_unused}" = "xyes" ; then - AC_DEFINE([__UNUSED__], [__attribute__ ((unused))], [Macro declaring a function argument to be unused.]) -else - AC_DEFINE([__UNUSED__], [], [__attribute__ ((unused)) is not supported.]) -fi -]) - -dnl Usage: EFL_ATTRIBUTE_VECTOR -dnl call AC_DEFINE for HAVE_GCC_ATTRIBUTE_VECTOR if __attribute__((vector)) is available - -AC_DEFUN([EFL_ATTRIBUTE_VECTOR], -[ -AC_MSG_CHECKING([for __attribute__ ((vector))]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -typedef int v4si __attribute__ ((vector_size (16))); - ]], - [[ -if (sizeof(v4si) == 16) - return 0; -else - return -1; - ]])], - [have_attribute_vector="yes"], - [have_attribute_vector="no"]) -AC_MSG_RESULT([${have_attribute_vector}]) - -if test "x${have_attribute_vector}" = "xyes" ; then - AC_DEFINE([HAVE_GCC_ATTRIBUTE_VECTOR], [1], [Define to 1 if your compiler supports __attribute__ ((vector)).]) -fi -]) - -dnl End of efl_attribute.m4 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 <vtorri at univ-evry dot fr> -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 <vtorri at univ-evry dot fr> -dnl and Albin Tonnerre <albin dot tonnerre at gmail dot com> -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 <vtorri at univ-evry dot fr> -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 <limits.h>, 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 <limits.h> - ]], - [[ -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 <cedric.bail at free dot fr> -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 47eb174..0000000 --- a/packaging/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = slackware 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/packaging/pkgbuild/PKGBUILD b/packaging/pkgbuild/PKGBUILD deleted file mode 100644 index 8ce7189..0000000 --- a/packaging/pkgbuild/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Enlightenment Developers <[email protected]> -pkgname=('extra-git') -pkgver=1.8.99.8967.a1cfce6 -pkgrel=1 -pkgdesc="Enlightenment toolkit extra - GIT development snapshot" -arch=('i686' 'x86_64' 'arm') -url="http://http://extra.enlightenment.org/app/"; -license=('WTFPL') -makedepends=('doxygen' 'imagemagick' 'git') -depends=('efl') -options=('!libtool' 'debug') -provides=('extra') -reldir=('../../../') - - -pkgver() { - cd $reldir - - for _i in v_maj v_min v_mic; do - local v_ver=$v_ver.$(grep -m 1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*") - done - - v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac) - - printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" -} - -build() { - cd $reldir - - export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer" - [[ -e Makefile ]] && make clean distclean - ./configure --prefix=/usr \ - --disable-static - make - make doc -} - -package_extra-git() { - cd $reldir - - make -j1 DESTDIR="$pkgdir/" install - install -Dm644 README "$pkgdir/usr/share/$pkgname/README" - install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS" - install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog" - install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS" - ln -s "COPYING" "$pkgdir/usr/share/$pkgname/COPYING" -} - -package_extra_doc-git() { - pkgdesc="Documentation for extra" - arch=('any') - unset depends optdepends - - cd $reldir - mkdir -p "$pkgdir/usr/share/doc/$pkgname" - cp -a doc/html "$pkgdir/usr/share/doc/$pkgname/html" - cp -a doc/latex "$pkgdir/usr/share/doc/$pkgname/latex" -} diff --git a/packaging/slackware/Makefile.am b/packaging/slackware/Makefile.am deleted file mode 100644 index 028e0cc..0000000 --- a/packaging/slackware/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = doinst.sh extra.SlackBuild slack-desc slack-required - diff --git a/packaging/slackware/doinst.sh b/packaging/slackware/doinst.sh deleted file mode 100644 index 6dfbe18..0000000 --- a/packaging/slackware/doinst.sh +++ /dev/null @@ -1 +0,0 @@ -# Stuff done after package installation diff --git a/packaging/slackware/extra.SlackBuild b/packaging/slackware/extra.SlackBuild deleted file mode 100755 index d027c61..0000000 --- a/packaging/slackware/extra.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash -# -# Begin extra.SlackBuild -# -# Copyright (C) 2012-2013 Jerome Pinot <[email protected]> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -NAME=extra -BUILD=${BUILD:-1jp} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=${TMP}/package-${NAME} - -# First check if we are in the right folder -if [ -f ./${NAME}.SlackBuild ]; then - echo 'Found SlackBuild' -else - echo 'Error: You must run this script from the packaging/slackware sub-folder!' - exit 1 -fi - -# Get the version number from configure.ac -if [ -f ../../configure.ac ];then - VERSION=`grep "AC_INIT" ../../configure.ac | cut -d' ' -f2 | sed -e 's/\[//' -e 's/\],//'` -else - echo "Error: can't find configure.ac!" - exit 2 -fi - -# if ${ARCH} is unset, we have to guess it with uname -if [ -z "${ARCH}" ]; then - case "$(uname -m)" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - *) export ARCH=$(uname -m) ;; - esac -fi - -# Set generic flags for gcc -SCFLAGS='-O2' -if [ "${ARCH}" = "i486" ]; then - SCFLAGS="${SCFLAGS} -march=i486 -mtune=i686" - LIBDIR="/usr/lib" -elif [ "${ARCH}" = "x86_64" ]; then - SCFLAGS="${SCFLAGS} -fPIC" - LIBDIR="/usr/lib64" -elif [ "${ARCH}" = "arm" ]; then - SCFLAGS="${SCFLAGS} -march=armv4 -mtune=xscale" - LIBDIR="/usr/lib" -fi - -# Creating directories -if [ ! -d ${TMP} ]; then - mkdir -p ${TMP} -fi -rm -rf ${PKG} -mkdir -p ${PKG} - -# Configuring -cd ../.. -CFLAGS="${SCFLAGS}" \ - ./configure \ - --prefix=/usr \ - --libdir=${LIBDIR} \ - --mandir=/usr/man \ - --docdir=/usr/doc/${NAME}-${VERSION} - -# Building -make - -# Installing -make DESTDIR=${PKG} install - -# Cleaning -cd ${PKG} -gzip -9 usr/man/man1/${NAME}.1 - -find ${PKG} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find ${PKG} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Building the package -mkdir install -install -m644 ${CWD}/doinst.sh install/ -install -m644 ${CWD}/slack-desc install/ -install -m644 ${CWD}/slack-required install/ -makepkg -l y -c n ${CWD}/${NAME}-${VERSION}-${ARCH}-${BUILD}.txz -rm -rf ${PKG} - -# End extra.SlackBuild diff --git a/packaging/slackware/slack-desc b/packaging/slackware/slack-desc deleted file mode 100644 index f877468..0000000 --- a/packaging/slackware/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -extra: extra -extra: -extra: extra is an example of application written using the Enlightenment -extra: Foundation Libraries. -extra: -extra: It requires elementary. -extra: -extra: extra was written by Andy Williams <[email protected]> -extra: website: <http://http://extra.enlightenment.org/app//> -extra: -extra: diff --git a/packaging/slackware/slack-required b/packaging/slackware/slack-required deleted file mode 100644 index 29e9f10..0000000 --- a/packaging/slackware/slack-required +++ /dev/null @@ -1,5 +0,0 @@ -eina >= 1.8.0 -evas >= 1.8.0 -ecore >= 1.8.0 -edje >= 1.8.0 -elementary >= 1.8.0 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 a8a7e73..0000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = extra - -AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ --I$(top_builddir)/src/bin/ \ --I$(top_srcdir)/src/bin/ \ --I$(top_builddir)/src/lib/ \ --I$(top_srcdir)/src/lib/ \ -@EFL_CFLAGS@ - -extra_SOURCES = extra_main.c \ - extra_theme_selector.c \ - extra_background_selector.c \ - extra_util.c \ - gettext.h - -extra_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libextra.la - -localedir = $(datadir)/locale -DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ - -EXTRA_DIST = extra_private.h diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am deleted file mode 100644 index 4c38eb0..0000000 --- a/src/lib/Makefile.am +++ /dev/null @@ -1,24 +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_EXTRA_BUILD - -lib_LTLIBRARIES = libextra.la - -includes_HEADERS = extra.h -includesdir = $(includedir)/extra-@VMAJ@ - -libextra_la_SOURCES = extra.c \ - extra_api_helper.c \ - extra_private.h \ - extra.h \ - jsmn/jsmn.c \ - jsmn/jsmn.h - -libextra_la_LIBADD = @EFL_LIBS@ -lm -libextra_la_LDFLAGS = -no-undefined @EFL_LTLIBRARY_FLAGS@ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am deleted file mode 100644 index c4e5e98..0000000 --- a/src/tests/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -if EFL_HAVE_TESTS - -check_PROGRAMS = extra_tests - -extra_tests_SOURCES = test_extra.c -extra_tests_CPPFLAGS = -I$(top_builddir)/src/lib/ \ --DPACKAGE_TESTS_DIR=\"$(top_srcdir)/src/tests/\" \ --DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/\" \ -@EFL_CFLAGS@ \ -@CHECK_CFLAGS@ -extra_tests_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libextra.la -extra_tests_DEPENDENCIES = $(top_builddir)/src/lib/libextra.la - -endif - -EXTRA_DIST = test_extra.c --
