devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=c9c54d2e57769bb3664c8b26efbabea67f3bb8e4
commit c9c54d2e57769bb3664c8b26efbabea67f3bb8e4 Author: Christopher Michael <devilho...@comcast.net> Date: Fri Feb 12 12:26:49 2021 -0500 express: Remove all old autofoo files --- Makefile.am | 88 ----------------- configure.ac | 209 ----------------------------------------- data/Makefile.am | 4 - data/desktop/Makefile.am | 6 -- data/fonts/Makefile.am | 31 ------ data/images/Makefile.am | 6 -- data/themes/Makefile.am | 29 ------ data/themes/images/Makefile.am | 48 ---------- data/themes/sounds/Makefile.am | 8 -- m4/ac_attribute.m4 | 14 --- m4/efl_attribute.m4 | 83 ---------------- m4/efl_beta.m4 | 5 - m4/efl_binary.m4 | 71 -------------- m4/efl_compiler.m4 | 90 ------------------ m4/efl_compiler_flag.m4 | 57 ----------- m4/efl_eo.m4 | 6 -- m4/efl_path_max.m4 | 36 ------- m4/efl_threads.m4 | 132 -------------------------- src/Makefile.am | 5 - src/bin/Makefile.am | 78 --------------- src/lib/Makefile.am | 23 ----- 21 files changed, 1029 deletions(-) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 36cef76..0000000 --- a/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -SUBDIRS = src data -if HAVE_PO - SUBDIRS += po -endif - -MAINTAINERCLEANFILES = \ - ABOUT-NLS* \ - Makefile.in \ - aclocal.m4 \ - compile \ - config.guess \ - config.h.in \ - config.h.in~ \ - config.rpath \ - config.sub \ - configure \ - configure~\ - depcomp \ - install-sh \ - ltmain.sh \ - missing \ - mkinstalldirs \ - INSTALL \ - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \ - $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \ - m4/libtool.m4 \ - m4/lt~obsolete.m4 \ - m4/ltoptions.m4 \ - m4/ltsugar.m4 \ - m4/ltversion.m4 \ - m4/codeset.m4 \ - m4/gettext.m4 \ - m4/glibc2.m4 \ - m4/glibc21.m4 \ - m4/iconv.m4 \ - m4/intmax.m4 \ - m4/intdiv0.m4 \ - m4/inttypes_h.m4 \ - m4/inttypes.m4 \ - m4/inttypes-pri.m4 \ - m4/isc-posix.m4 \ - m4/lcmessage.m4 \ - m4/lib-ld.m4 \ - m4/lib-link.m4 \ - m4/lib-prefix.m4 \ - m4/nls.m4 \ - m4/po.m4 \ - m4/progtest.m4 \ - m4/stdint_h.m4 \ - m4/uintmax_t.m4 \ - m4/ulonglong.m4 \ - m4/intl.m4 \ - m4/intldir.m4 \ - m4/intlmacosx.m4 \ - m4/lock.m4 \ - m4/longlong.m4 \ - m4/printf-posix.m4 \ - m4/size_max.m4 \ - m4/visibility.m4 \ - m4/wchar_t.m4 \ - m4/wint_t.m4 \ - m4/xsize.m4 \ - express_config.h.in - -if HAVE_PO - -MAINTAINERCLEANFILES += \ - 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 - -endif - -EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN - -filesdir = $(datadir)/express -files_DATA = $(EXTRA_DIST) - -ACLOCAL_AMFLAGS = -I m4 - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = express.pc diff --git a/configure.ac b/configure.ac deleted file mode 100644 index a701fdf..0000000 --- a/configure.ac +++ /dev/null @@ -1,209 +0,0 @@ - -m4_define([v_maj], [0]) -m4_define([v_min], [0]) -m4_define([v_mic], [2]) -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([express], [v_ver], [devilho...@comcast.net]) -AC_PREREQ([2.60]) -AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADERS([express_config.h]) - -AM_INIT_AUTOMAKE([1.6 dist-xz subdir-objects]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -AC_USE_SYSTEM_EXTENSIONS - -LT_INIT([win32-dll disable-static]) - -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]) - - -### Additional options to configure - - -### Default options with respect to host - -AC_CANONICAL_HOST - -have_win32="no" -case "$host_os" in - mingw*) - have_win32="yes" - ;; -esac - - -### Checks for programs - -AM_GNU_GETTEXT_VERSION([0.17]) - -m4_ifdef([AC_GNU_GETTEXT], [ -AC_GNU_GETTEXT([external]) -po_makefile_in=po/Makefile.in -have_po="yes" -], -[ -m4_ifdef([AM_GNU_GETTEXT], [ -AM_GNU_GETTEXT([external]) -po_makefile_in=po/Makefile.in -have_po="yes" -], -[ -have_po="no" -]) -]) -AC_SUBST([LTLIBINTL]) -LOCALE_DIR="${localedir}" -AC_SUBST(LOCALE_DIR) - -if test "x${POSUB}" = "x" ; then - have_po="no" -fi - -AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) - -AC_PROG_CC - -PKG_PROG_PKG_CONFIG -if test "x${PKG_CONFIG}" = "x" ; then - AC_MSG_ERROR([pkg-config tool not found. Install it or set PKG_CONFIG environment variable to that path tool. Exiting...]) -fi - -EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) - -### Checks for libraries - -efl_version="1.12.0" - -requirements_libexpress_pc="ecore-con >= ${efl_version} ecore >= ${efl_version} eina >= ${efl_version} ${requirements_libexpress_pc}" -AC_SUBST([requirements_libexpress_pc]) - -PKG_CHECK_MODULES([LIBEXPRESS], [${requirements_libexpress_pc}]) - -PKG_CHECK_MODULES([ELDBUS], [eldbus], - [ - AC_DEFINE(HAVE_ELDBUS, 1, [DBUS support]) - have_eldbus="yes" - ], - [have_eldbus="no"] -) - -PKG_CHECK_MODULES([EXPRESS], - [eina] - [eet] - [evas] - [edje] - [efreet] - [ecore-file] - [elementary] -) - -requirements_libexpress_libs="" -AC_SUBST([requirements_libexpress_libs]) - -if test "x${have_win32}" = "xyes" ; then - requirements_libexpress_libs="-lws2_32 ${requirements_libexpress_libs}" -fi - -LIBEXPRESS_LIBS="${LIBEXPRESS_LIBS} ${requirements_libexpress_libs}" - - -### Checks for header files - -AC_HEADER_TIME - -AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h sys/mman.h]) - - -### Checks for types - - -### Checks for structures - - -### Checks for compiler characteristics - -AM_PROG_CC_C_O - -EFL_ATTRIBUTE_VECTOR -EFL_ATTRIBUTE_ALWAYS_INLINE -EFL_CHECK_PATH_MAX -EFL_CHECK_THREADS - -EFL_ENABLE_EO_API_SUPPORT -EFL_ENABLE_BETA_API_SUPPORT - -EFL_CHECK_COMPILER_FLAGS([EXP], [-Wall -Wextra -Wshadow -Wpointer-arith -fdata-sections -ffunction-sections]) - -LIBEXPRESS_CFLAGS="${LIBEXPRESS_CFLAGS} ${EXP_CFLAGS}" -EXPRESS_CFLAGS="${EXPRESS_CFLAGS} ${EXP_CFLAGS}" - - -### Checks for linker characteristics - -EFL_CHECK_LINKER_FLAGS([EXP], [-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries]) - -LIBEXPRESS_LIBS="${LIBEXPRESS_LIBS} ${EXP_LIBS}" -EXPRESS_LIBS="${EXPRESS_LIBS} ${EXP_LIBS}" - - -### Checks for library functions - -AC_FUNC_ALLOCA - -AC_CHECK_FUNCS([getuid geteuid mkstemps]) - -AC_CONFIG_FILES([ -Makefile -express.pc -src/Makefile -src/lib/Makefile -src/bin/Makefile -data/Makefile -data/desktop/Makefile -data/fonts/Makefile -data/images/Makefile -data/themes/Makefile -data/themes/images/Makefile -data/themes/sounds/Makefile -po/Makefile.in -]) - -AC_OUTPUT - -##################################################################### -## Info - -echo -echo -echo -echo "------------------------------------------------------------------------" -echo "$PACKAGE $VERSION" -echo "------------------------------------------------------------------------" -echo -echo -echo "Configuration..............: os=${host_os}" -echo " Threads..................: ${efl_have_threads} (${features_thread})" -echo -echo "Compilation................: make (or gmake)" -echo " CPPFLAGS.................: $CPPFLAGS" -echo " CFLAGS...................: $CFLAGS" -echo " LIBS.....................: $LIBS" -echo " LDFLAGS..................: $LDFLAGS" -echo -echo "Installation...............: make install (as root if needed, with 'su' or 'sudo')" -echo " prefix...................: $prefix" -echo -echo diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index b5fdc0f..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = desktop themes fonts images - - diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am deleted file mode 100644 index 782f4df..0000000 --- a/data/desktop/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -desktopdir = $(datadir)/applications -desktop_DATA = express.desktop -icondir = $(datadir)/icons -icon_DATA = express.png -EXTRA_DIST = express.desktop express.png diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am deleted file mode 100644 index 320621d..0000000 --- a/data/fonts/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(pkgdatadir)/fonts -files_DATA = \ -10x20.pcf \ -4x6.pcf \ -5x7.pcf \ -5x8.pcf \ -6x10.pcf \ -6x12.pcf \ -6x13.pcf \ -6x9.pcf \ -7x13.pcf \ -7x14.pcf \ -8x13.pcf \ -9x15.pcf \ -9x18.pcf \ -nexus.pcf \ -terminus-12.pcf \ -terminus-14-bold.pcf \ -terminus-14.pcf \ -terminus-16-bold.pcf \ -terminus-16.pcf \ -terminus-18-bold.pcf \ -terminus-18.pcf \ -terminus-20-bold.pcf \ -terminus-20.pcf - -EXTRA_DIST = $(files_DATA) \ -TERMINUS.txt \ -XFONT.txt - diff --git a/data/images/Makefile.am b/data/images/Makefile.am deleted file mode 100644 index 9d547c2..0000000 --- a/data/images/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -filesdir = $(pkgdatadir)/images - -files_DATA = \ - operator.png - -EXTRA_DIST = $(files_DATA) diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am deleted file mode 100644 index 45f27e4..0000000 --- a/data/themes/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = images sounds - -EDJE_CC = @edje_cc@ -EDJE_FLAGS_VERBOSE_ = -EDJE_FLAGS_VERBOSE_0 = -EDJE_FLAGS_VERBOSE_1 = -v -EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/images -fd $(top_srcdir)/data/fonts -sd $(top_srcdir)/data/themes/sounds - -filesdir = $(pkgdatadir)/themes -files_DATA = \ - default.edj - -AM_V_EDJ = $(am__v_EDJ_$(V)) -am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY)) -am__v_EDJ_0 = @echo " EDJ " $@; - -EXTRA_DIST = \ - default.edc \ - default_colors.in.edc - -default.edj: Makefile default.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/default.edc \ - $(top_builddir)/data/themes/default.edj - -clean-local: - rm -f *.edj diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am deleted file mode 100644 index e8545fe..0000000 --- a/data/themes/images/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = \ -bg_bevel.png \ -bg_shine.png \ -bg_glint.png \ -bg_glow_in.png \ -bg_shadow.png \ -bg_shadow2.png \ -bg_shadow3.png \ -cr_glow.png \ -cr_key.png \ -cr_out.png \ -cr_pulse.png \ -fn_shadow.png \ -pm_fill.png \ -pm_overlay.png \ -pm_shadow.png \ -inset_shadow.png \ -icon_settings.png \ -lk_bottom.png \ -lk_left.png \ -lk_right.png \ -tab_base_bottom.png \ -tab_base_l0.png \ -tab_base_l1.png \ -tab_base_m.png \ -tab_base_r0.png \ -tab_base_r1.png \ -tab_bg_l0.png \ -tab_bg_l1.png \ -tab_bg_r0.png \ -tab_bg_r1.png \ -tab_other_l.png \ -tab_other_m.png \ -tab_other_r.png \ -tab_shad_l0.png \ -tab_shad_l1.png \ -tab_shad_l2.png \ -tab_shad_r0.png \ -tab_shad_r1.png \ -tab_shad_r2.png \ -media_bg.png \ -media_play.png \ -media_stop.png \ -media_pause.png \ -media_line.png \ -media_knob_vol.png \ -media_knob_pos.png diff --git a/data/themes/sounds/Makefile.am b/data/themes/sounds/Makefile.am deleted file mode 100644 index 68a996f..0000000 --- a/data/themes/sounds/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = \ -bell.wav \ -kbd-tap2.wav \ -kbd-tap3.wav \ -kbd-tap4.wav \ -kbd-tap5.wav \ -kbd-tap.wav diff --git a/m4/ac_attribute.m4 b/m4/ac_attribute.m4 deleted file mode 100644 index 46c1a42..0000000 --- a/m4/ac_attribute.m4 +++ /dev/null @@ -1,14 +0,0 @@ - -AC_DEFUN([AC_C___ATTRIBUTE__], -[ - AC_MSG_CHECKING(for __attribute__) - AC_CACHE_VAL(ac_cv___attribute__, [ - AC_TRY_COMPILE([#include <stdlib.h>], - [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }], - ac_cv___attribute__=yes, ac_cv___attribute__=no)]) - if test "$ac_cv___attribute__" = "yes"; then - AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has __attribute__]) - fi - AC_MSG_RESULT($ac_cv___attribute__) -]) - diff --git a/m4/efl_attribute.m4 b/m4/efl_attribute.m4 deleted file mode 100644 index 4f31d93..0000000 --- a/m4/efl_attribute.m4 +++ /dev/null @@ -1,83 +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_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 Usage: EFL_ATTRIBUTE_ALWAYS_INLINE -dnl call AC_DEFINE for alway_inline if __attribute__((always_inline)) is available - -AC_DEFUN([EFL_ATTRIBUTE_ALWAYS_INLINE], -[ - -have_attribute_forceinline="no" - -AC_MSG_CHECKING([for __forceinline]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include <windows.h> -static __forceinline void foo(void) {} - ]], - [[ - ]])], - [ - have_attribute_always_inline="yes" - have_attribute_forceinline="yes" - ], - [have_attribute_always_inline="no"]) - -AC_MSG_RESULT([${have_attribute_always_inline}]) - -if test "x${have_attribute_always_inline}" = "xno" ; then - AC_MSG_CHECKING([for __attribute__ ((__always_inline__))]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -static __attribute__((__always_inline__)) inline void foo(void) {} - ]], - [[ - ]])], - [have_attribute_always_inline="yes"], - [have_attribute_always_inline="no"]) - AC_MSG_RESULT([${have_attribute_always_inline}]) -fi - -if test "x${have_attribute_always_inline}" = "xyes" ; then - if test "x${have_attribute_forceinline}" = "xyes" ; then - AC_DEFINE([EFL_ALWAYS_INLINE], [__forceinline], [Macro declaring a function to always be inlined.]) - else - AC_DEFINE([EFL_ALWAYS_INLINE], [__attribute__ ((__always_inline__)) inline], [Macro declaring a function to always be inlined.]) - fi -else - AC_DEFINE([EFL_ALWAYS_INLINE], [static inline], [Macro declaring a function to always be inlined.]) -fi -]) - -dnl End of efl_attribute.m4 diff --git a/m4/efl_beta.m4 b/m4/efl_beta.m4 deleted file mode 100644 index c804729..0000000 --- a/m4/efl_beta.m4 +++ /dev/null @@ -1,5 +0,0 @@ -dnl use: EFL_ENABLE_BETA_API_SUPPORT -AC_DEFUN([EFL_ENABLE_BETA_API_SUPPORT], -[ - AC_DEFINE([EFL_BETA_API_SUPPORT], [1], [Enable access to unstable EFL API that are still in beta]) -]) diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4 deleted file mode 100644 index c774688..0000000 --- a/m4/efl_binary.m4 +++ /dev/null @@ -1,71 +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 - -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_with_binary=$(pkg-config --variable=prefix $1)/bin/$3]) - -DOWN=${_efl_with_binary} -AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}]) - -with_binary_[]m4_defn([DOWN])=${_efl_with_binary} - -AC_SUBST(DOWN) - -]) diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4 deleted file mode 100644 index 32819f2..0000000 --- a/m4/efl_compiler.m4 +++ /dev/null @@ -1,90 +0,0 @@ -dnl Copyright (C) 2012 Vincent Torri <vincent dot torri at gmail dot com> -dnl This code is public domain and can be freely used or copied. - -dnl Macro that check if compiler of linker flags are available - - -dnl Macro that checks for a compiler flag availability -dnl -dnl _EFL_CHECK_COMPILER_FLAGS(EFL, FLAGS) -dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value) -dnl have_flag: yes or no. -AC_DEFUN([_EFL_CHECK_COMPILER_FLAGS], -[dnl -m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))dnl - -dnl store in options -Wfoo if -Wno-foo is passed -option="m4_bpatsubst([[$2]], [-Wno-], [-W])" -CFLAGS_save="${CFLAGS}" -CFLAGS="${CFLAGS} ${option}" -AC_LANG_PUSH([C]) - -AC_MSG_CHECKING([whether the compiler supports $2]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]])], - [have_flag="yes"], - [have_flag="no"]) -AC_MSG_RESULT([${have_flag}]) - -AC_LANG_POP([C]) -CFLAGS="${CFLAGS_save}" -if test "x${have_flag}" = "xyes" ; then - UPEFL[_CFLAGS]="${UPEFL[_CFLAGS]} [$2]" -fi -AC_SUBST(UPEFL[_CFLAGS])dnl -m4_popdef([UPEFL])dnl -]) - -dnl EFL_CHECK_COMPILER_FLAGS(EFL, FLAGS) -dnl Checks if FLAGS are supported and add to EFL_CLFAGS. -dnl -dnl It will first try every flag at once, if one fails will try them one by one. -AC_DEFUN([EFL_CHECK_COMPILER_FLAGS], -[dnl -_EFL_CHECK_COMPILER_FLAGS([$1], [$2]) -if test "${have_flag}" != "yes"; then -m4_foreach_w([flag], [$2], [_EFL_CHECK_COMPILER_FLAGS([$1], m4_defn([flag]))]) -fi -]) - - -dnl Macro that checks for a linker flag availability -dnl -dnl _EFL_CHECK_LINKER_FLAGS(EFL, FLAGS) -dnl AC_SUBST : EFL_LDFLAGS (EFL being replaced by its value) -dnl have_flag: yes or no -AC_DEFUN([_EFL_CHECK_LINKER_FLAGS], -[dnl -m4_pushdef([UPEFL], m4_translit([[$1]], [-a-z], [_A-Z]))dnl - -LDFLAGS_save="${LDFLAGS}" -LDFLAGS="${LDFLAGS} $2" -AC_LANG_PUSH([C]) - -AC_MSG_CHECKING([whether the linker supports $2]) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]])], - [have_flag="yes"], - [have_flag="no"]) -AC_MSG_RESULT([${have_flag}]) - -AC_LANG_POP([C]) -LDFLAGS="${LDFLAGS_save}" -if test "x${have_flag}" = "xyes" ; then - UPEFL[_LDFLAGS]="${UPEFL[_LDFLAGS]} [$2]" -fi -AC_SUBST(UPEFL[_LDFLAGS])dnl -m4_popdef([UPEFL])dnl -]) - -dnl EFL_CHECK_LINKER_FLAGS(EFL, FLAGS) -dnl Checks if FLAGS are supported and add to EFL_CLFAGS. -dnl -dnl It will first try every flag at once, if one fails will try them one by one. -AC_DEFUN([EFL_CHECK_LINKER_FLAGS], -[dnl -_EFL_CHECK_LINKER_FLAGS([$1], [$2]) -if test "${have_flag}" != "yes"; then -m4_foreach_w([flag], [$2], [_EFL_CHECK_LINKER_FLAGS([$1], m4_defn([flag]))]) -fi -])dnl diff --git a/m4/efl_compiler_flag.m4 b/m4/efl_compiler_flag.m4 deleted file mode 100644 index 618c6a6..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 CFLAGS if supported (will be passed to ld anyway). - -AC_DEFUN([EFL_LINKER_FLAG], -[ - -CFLAGS_save="${CFLAGS}" -CFLAGS="${CFLAGS} $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 - CFLAGS="${CFLAGS_save}" -fi -AC_LANG_POP([C]) - -]) diff --git a/m4/efl_eo.m4 b/m4/efl_eo.m4 deleted file mode 100644 index 864baf5..0000000 --- a/m4/efl_eo.m4 +++ /dev/null @@ -1,6 +0,0 @@ -dnl use: EFL_ENABLE_EO_API_SUPPORT -AC_DEFUN([EFL_ENABLE_EO_API_SUPPORT], -[ - AC_DEFINE([EFL_EO_API_SUPPORT], [1], [Enable access to unstable EFL Eo API]) -]) - 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_threads.m4 b/m4/efl_threads.m4 deleted file mode 100644 index 04b3e64..0000000 --- a/m4/efl_threads.m4 +++ /dev/null @@ -1,132 +0,0 @@ -dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr> -dnl rwlock code added by Mike Blumenkrantz <mike at zentific dot com> -dnl This code is public domain and can be freely used or copied. - -dnl Macro that check if POSIX or Win32 threads library is available or not. - -dnl Usage: EFL_CHECK_THREADS(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) -dnl Call AC_SUBST(EFL_PTHREAD_CFLAGS) -dnl Call AC_SUBST(EFL_PTHREAD_LIBS) -dnl Defines EFL_HAVE_POSIX_THREADS or EFL_HAVE_WIN32_THREADS, and EFL_HAVE_THREADS - -AC_DEFUN([EFL_CHECK_THREADS], -[ - -dnl Generic thread detection - -EFL_PTHREAD_CFLAGS="-D_REENTRANT" -EFL_PTHREAD_LIBS="" - -_efl_have_posix_threads="no" -_efl_have_win32_threads="no" - -dnl Use generic infrastructure for pthread detection (What a hell of a mess !) -gl_LOCK - -AC_DEFINE([EFL_HAVE_THREADS], [1], [Define to mention that POSIX or Win32 threads are supported]) - -case "$host_os" in - mingw*) - _efl_have_win32_threads="yes" - efl_have_setaffinity="yes" - AC_DEFINE([EFL_HAVE_WIN32_THREADS], [1], [Define to mention that Win32 threads are supported]) - ;; - *) - _efl_have_posix_threads="${gl_use_threads}" - AC_DEFINE([EFL_HAVE_POSIX_THREADS], [1], [Define to mention that POSIX threads are supported]) - ;; -esac - -dnl System specific CFLAGS -if test "x${_efl_have_posix_threads}" = "xyes"; then - case "$host_os" in - osf*) EFL_PTHREAD_CFLAGS="-D_REENTRANT" ;; - aix* | freebsd*) EFL_PTHREAD_CFLAGS="-D_THREAD_SAFE" ;; - solaris*) EFL_PTHREAD_CFLAGS="-D_REENTRANT" ;; - esac -fi - -dnl check if the compiler supports POSIX threads -if test "x${_efl_have_posix_threads}" = "xyes" ; then - - SAVE_LIBS=${LIBS} - LIBS="${LIBS} ${LIBMULTITHREAD}" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ -#include <pthread.h> - ]], - [[ -pthread_barrier_t barrier; -pthread_barrier_init(&barrier, NULL, 1); - ]])], - [efl_have_pthread_barrier="yes"], - [efl_have_pthread_barrier="no"]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ -#include <stdlib.h> -#include <pthread.h> -#include <sched.h> - ]], - [[ -pthread_attr_setaffinity_np(NULL, 0, NULL); - ]])], - [efl_have_setaffinity="yes"], - [efl_have_setaffinity="no"]) - LIBS=${SAVE_LIBS} -fi - -AC_MSG_CHECKING([which threads API is used]) -if test "x${_efl_have_posix_threads}" = "xyes" ; then - efl_have_threads="POSIX" -else - if test "x${_efl_have_win32_threads}" = "xyes" ; then - efl_have_threads="Windows" - efl_have_pthread_barrier="no" - else - efl_have_threads="no" - efl_have_pthread_barrier="no" - fi -fi -AC_MSG_RESULT([${efl_have_threads}]) - -EFL_PTHREAD_LIBS="${LTLIBMULTITHREAD}" - -AC_SUBST(EFL_PTHREAD_CFLAGS) -AC_SUBST(EFL_PTHREAD_LIBS) - -dnl check if the compiler supports pthreads spinlock - -efl_have_posix_threads_spinlock="no" - -if test "x${_efl_have_posix_threads}" = "xyes" ; then - SAVE_LIBS=${LIBS} - LIBS="${LIBS} ${LIBMULTITHREAD}" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ -#include <pthread.h> -#include <sched.h> - ]], - [[ -pthread_spinlock_t lock; -int res; -res = pthread_spin_init(&lock, PTHREAD_PROCESS_PRIVATE); -sched_yield(); - ]])], - [efl_have_posix_threads_spinlock="yes"], - [efl_have_posix_threads_spinlock="no"]) - LIBS=${SAVE_LIBS} - -fi - -AC_MSG_CHECKING([whether to build POSIX threads spinlock code]) -AC_MSG_RESULT([${efl_have_posix_threads_spinlock}]) - -if test "x${efl_have_posix_threads_spinlock}" = "xyes" ; then - AC_DEFINE([EFL_HAVE_POSIX_THREADS_SPINLOCK], [1], [Define to mention that POSIX threads spinlocks are supported]) -fi - -AS_IF([test "x$_efl_have_posix_threads" = "xyes" || test "x$_efl_have_win32_threads" = "xyes"], - [$1], - [m4_if([$2], [$2], [AC_MSG_ERROR([Threads are required.])])]) - -]) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 98a2622..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ - config.h.in config.sub configure install-sh \ - ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in acconfig.h depcomp INSTALL *~ -SUBDIRS = lib bin diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am deleted file mode 100644 index feef8a0..0000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = express - -express_CPPFLAGS = \ --I$(top_srcdir) \ --I$(top_srcdir)/src/lib \ --I$(top_srcdir)/src/bin \ --DPACKAGE_BIN_DIR=\"$(bindir)\" \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ --DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \ -@EXPRESS_CFLAGS@ - -EXPRESSHEADERS = \ -private.h \ -config.h \ -theme.h \ -colors.h \ -utils.h \ -dbus.h \ -window.h \ -channel.h \ -lz4/lz4.h \ -grid.h \ -grid_save.h \ -selector.h \ -callbacks.h \ -options.h \ -options_general.h \ -options_font.h \ -options_colors.h \ -options_video.h \ -options_networks.h \ -options_network.h \ -options_servers.h \ -options_channels.h \ -options_tools.h \ -gravatar.h \ -md5/md5.h \ -media.h \ -commands.h - -express_SOURCES = \ -$(EXPRESSHEADERS) \ -config.c \ -main.c \ -theme.c \ -colors.c \ -utils.c \ -dbus.c \ -window.c \ -channel.c \ -lz4/lz4.c \ -grid.c \ -grid_save.c \ -selector.c \ -callbacks.c \ -options.c \ -options_general.c \ -options_font.c \ -options_colors.c \ -options_video.c \ -options_networks.c \ -options_network.c \ -options_servers.c \ -options_channels.c \ -options_tools.c \ -gravatar.c \ -md5/md5.c \ -media.c \ -commands.c - -express_LDADD = \ -$(top_builddir)/src/lib/libexpress.la \ -@EXPRESS_LIBS@ \ -@LTLIBINTL@ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am deleted file mode 100644 index fd612e3..0000000 --- a/src/lib/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -includes_HEADERS = Express.h -includesdir = $(pkgincludedir)-@VMAJ@ - -lib_LTLIBRARIES = libexpress.la - -libexpress_la_SOURCES = \ -private.h \ -network.c \ -main.c - -libexpress_la_CPPFLAGS = \ --I$(top_srcdir) \ --I$(top_srcdir)/src/lib \ --DPACKAGE_LOCALE_DIR=\"$(datadir)/locale\" \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ -@LIBEXPRESS_CFLAGS@ - -libexpress_la_LIBADD = @LIBEXPRESS_LIBS@ - -libexpress_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ --