From c51d0095f9f107edd79c5cb63d343c347efb0471 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Sun, 12 Nov 2017 00:09:06 +0100 Subject: [PATCH] get rid of automake --- INSTALL | 64 ++++++- Makefile.am | 91 ---------- README | 6 - autogen.sh | 41 +---- configure.ac | 164 ------------------ data/Makefile.am | 3 - data/backgrounds/Makefile.am | 8 - data/desktop/Makefile.am | 6 - data/fonts/Makefile.am | 31 ---- data/icons/Makefile.am | 6 - data/images/Makefile.am | 6 - data/themes/Makefile.am | 78 --------- data/themes/images/Makefile.am | 77 -------- data/themes/nyanology/Makefile.am | 31 ---- .../nyanology/images-sources/Makefile.am | 6 - data/themes/nyanology/images/Makefile.am | 21 --- data/themes/sounds/Makefile.am | 8 - m4/ac_attribute.m4 | 47 ----- m4/efl_beta.m4 | 5 - m4/efl_binary.m4 | 71 -------- m4/efl_eo.m4 | 6 - man/Makefile.am | 4 - src/Makefile.am | 2 - src/bin/Makefile.am | 146 ---------------- 24 files changed, 59 insertions(+), 869 deletions(-) delete mode 100644 Makefile.am delete mode 100644 configure.ac delete mode 100644 data/Makefile.am delete mode 100644 data/backgrounds/Makefile.am delete mode 100644 data/desktop/Makefile.am delete mode 100644 data/fonts/Makefile.am delete mode 100644 data/icons/Makefile.am delete mode 100644 data/images/Makefile.am delete mode 100644 data/themes/Makefile.am delete mode 100644 data/themes/images/Makefile.am delete mode 100644 data/themes/nyanology/Makefile.am delete mode 100644 data/themes/nyanology/images-sources/Makefile.am delete mode 100644 data/themes/nyanology/images/Makefile.am delete mode 100644 data/themes/sounds/Makefile.am delete mode 100644 m4/ac_attribute.m4 delete mode 100644 m4/efl_beta.m4 delete mode 100644 m4/efl_binary.m4 delete mode 100644 m4/efl_eo.m4 delete mode 100644 man/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 src/bin/Makefile.am diff --git a/INSTALL b/INSTALL index f67815ae..3e797a19 100644 --- a/INSTALL +++ b/INSTALL @@ -1,11 +1,59 @@ -COMPILING and INSTALLING: +** COMPILING and INSTALLING ** +------------------------------ -If you got a official release tar archive do: - ./configure - -Then to compile: - make +Meson is the build system used for this project. For more information please +see: -To install (run this as root, or the user who handles installs): - make install + http://mesonbuild.com +---- + +Normal compilation in /usr/local: + + meson . build + ninja -C build + sudo ninja -C build install + +For meson build generic options: + + meson --help + +For a list of project specific options supported: + + cat meson_options.txt + +To set 1 or more project specific options: + + meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build + +To display current configuration: + + mesonconf build + +The above will only work after at least the following is done: + + meson . build + +** QUICK AND DIRTY HELP ** +-------------------------- + +How clean out the build and config and start fresh: + + rm -rf build + +How to make a dist tarball and check its build: +(must do it from git tree clone and commit all changes to git first) + + ninja -C build dist + +How to change prefix: + + meson --prefix=/path/to/prefix . build + +How to install in a specific destination directory for packaging: + + DESTDIR=/path/to/destdir ninja -C build install + +How to build with verbose output (full commands run): + + ninja -C build -v diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 48ded9e9..00000000 --- a/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -SUBDIRS = src data man - -if HAVE_PO - -SUBDIRS += po - -endif - -MAINTAINERCLEANFILES = \ -ABOUT-NLS* \ -Makefile.in \ -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \ -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.xz \ -aclocal.m4 \ -config.guess \ -config.rpath \ -terminology_config.h.in \ -config.sub \ -configure \ -compile \ -depcomp \ -install-sh \ -ltconfig \ -ltmain.sh \ -missing \ -mkinstalldirs \ -stamp-h.in \ -stamp-h \ -m4/libtool.m4 \ -m4/lt~obsolete.m4 \ -m4/ltoptions.m4 \ -m4/ltsugar.m4 \ -m4/ltversion.m4 - -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 \ -intl/ \ -m4/codeset.m4 \ -m4/fcntl-o.m4 \ -m4/glibc2.m4 \ -m4/glibc21.m4 \ -m4/intdiv0.m4 \ -m4/intl.m4 \ -m4/intldir.m4 \ -m4/intlmacosx.m4 \ -m4/intmax.m4 \ -m4/inttypes-pri.m4 \ -m4/inttypes_h.m4 \ -m4/lcmessage.m4 \ -m4/lock.m4 \ -m4/longlong.m4 \ -m4/printf-posix.m4 \ -m4/size_max.m4 \ -m4/stdint_h.m4 \ -m4/threadlib.m4 \ -m4/uintmax_t.m4 \ -m4/visibility.m4 \ -m4/wchar_t.m4 \ -m4/wint_t.m4 \ -m4/xsize.m4 \ -po/Makevars.template \ -m4/gettext.m4 \ -m4/iconv.m4 \ -m4/lib-ld.m4 \ -m4/lib-link.m4 \ -m4/lib-prefix.m4 \ -m4/nls.m4 \ -m4/po.m4 \ -m4/progtest.m4 - - -endif - -EXTRA_DIST = README AUTHORS COPYING autogen.sh config.rpath terminology.spec pkgbuild/PKGBUILD - -.PHONY: doc - -doc: - @echo "Empty doc target until we have real documentation." diff --git a/README b/README index b4d0486e..510f3846 100644 --- a/README +++ b/README @@ -25,12 +25,6 @@ Compiling: Once you have met requirements, compiling and installing is simple: - ./configure - make - make install - -To build using meson: - meson build cd build ninja diff --git a/autogen.sh b/autogen.sh index b814903b..65314877 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,40 +1,5 @@ #!/bin/sh -rm -rf autom4te.cache -rm -f aclocal.m4 ltmain.sh - -touch README -touch ABOUT-NLS - -echo "Running autopoint..." ; autopoint -f || : -echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 -echo "Running autoheader..." ; autoheader || exit 1 -echo "Running autoconf..." ; autoconf || exit 1 -echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 -echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 - -W=0 - -rm -f config.cache-env.tmp -echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp -echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp -echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp -echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp -echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp - -cmp config.cache-env.tmp config.cache-env >> /dev/null -if [ $? -ne 0 ]; then - W=1; -fi - -if [ $W -ne 0 ]; then - echo "Cleaning configure cache..."; - rm -f config.cache config.cache-env - mv config.cache-env.tmp config.cache-env -else - rm -f config.cache-env.tmp -fi - -if [ -z "$NOCONFIGURE" ]; then - ./configure -C "$@" -fi +rm -rf build +meson $@ . build +mesonconf build diff --git a/configure.ac b/configure.ac deleted file mode 100644 index cd5e592c..00000000 --- a/configure.ac +++ /dev/null @@ -1,164 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -# get rid of that stupid cache mechanism -rm -f config.cache - -AC_INIT([terminology], [1.1.99], [enlightenment-devel@lists.sourceforge.net]) -AC_PREREQ([2.60]) -AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_MACRO_DIR([m4]) - -AC_CONFIG_HEADERS([terminology_config.h]) - -AM_INIT_AUTOMAKE([1.6 dist-xz]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -AC_USE_SYSTEM_EXTENSIONS -AC_PROG_CC -AM_PROG_CC_C_O -AC_C___ATTRIBUTE__ - -efl_version="1.8.0" -AC_SUBST(efl_version) - - -m4_ifdef([AM_GNU_GETTEXT_VERSION], [ -AM_GNU_GETTEXT_VERSION([0.18]) -]) - -m4_ifdef([AM_GNU_GETTEXT], [ -AM_GNU_GETTEXT([external], [need-ngettext]) -po_makefile_in=po/Makefile.in -have_po="yes" -],[ -have_po="no" -]) - -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"]) - - -requirements="\ - elementary >= ${efl_version} \ - eina >= ${efl_version} \ - eet >= ${efl_version} \ - evas >= ${efl_version} \ - ecore >= ${efl_version} \ - ecore-evas >= ${efl_version} \ - ecore-file >= ${efl_version} \ - edje >= ${efl_version} \ - emotion >= ${efl_version} \ - ecore-input >= ${efl_version} \ - ecore-imf >= ${efl_version} \ - ecore-imf-evas >= ${efl_version} \ - ecore-ipc >= ${efl_version} \ - efreet >= ${efl_version} \ - ethumb_client >= ${efl_version} \ - " - -EFL_ENABLE_EO_API_SUPPORT -EFL_ENABLE_BETA_API_SUPPORT - -# check for fuzzing -want_fuzzing="fuzzing" -AC_ARG_ENABLE([fuzzing], - [AS_HELP_STRING([--enable-fuzzing],[Enable fuzzing on terminology. Binaries - are not suited for production. @<:@default=disabled@:>@])], - [ - if test "x${enableval}" = "xyes" ; then - want_fuzzing="yes" - AC_DEFINE([ENABLE_FUZZING], [1], [Fuzzing enabled]) - AC_SUBST([want_fuzzing]) - else - want_fuzzing="no" - fi - ], - [want_fuzzing="no"]) - -AM_CONDITIONAL([ENABLE_FUZZING], [test "${want_fuzzing}" = "yes"]) - -PKG_CHECK_MODULES([TERMINOLOGY], [${requirements}]) - -AC_CHECK_FUNCS(mkstemps) - -orig_cflags=$CFLAGS -CFLAGS+=" $TERMINOLOGY_CFLAGS " -LDFLAGS+=" $TERMINOLOGY_LDFLAGS $TERMINOLOGY_LIBS " -AC_MSG_CHECKING([for ecore_con_url_head]) -AC_LINK_IFELSE( - [ - AC_LANG_PROGRAM( - [[ - #include - ]], - [[ - ecore_con_url_head(NULL); - ]]) - ], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_ECORE_CON_URL_HEAD], [1], [define to 1 if ecore_con_url_head is available]) - ], - [ - AC_MSG_RESULT([no]) - ] -) -CFLAGS=$orig_cflags - -EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) - -AC_CONFIG_FILES([ -terminology.spec -pkgbuild/PKGBUILD -]) - -AC_OUTPUT([ -Makefile -src/Makefile -src/bin/Makefile -data/Makefile -data/desktop/Makefile -data/icons/Makefile -data/backgrounds/Makefile -data/images/Makefile -data/fonts/Makefile -data/themes/Makefile -data/themes/images/Makefile -data/themes/sounds/Makefile -data/themes/nyanology/Makefile -data/themes/nyanology/images/Makefile -data/themes/nyanology/images-sources/Makefile -man/Makefile -$po_makefile_in -]) - -##################################################################### -## Info - -echo -echo -echo -echo "------------------------------------------------------------------------" -echo "$PACKAGE $VERSION" -echo "------------------------------------------------------------------------" -echo -echo "Compilation................: make (or gmake)" -echo " CPPFLAGS.................: $CPPFLAGS" -echo " CFLAGS...................: $CFLAGS" -echo " LDFLAGS..................: $LDFLAGS" -echo -echo "Installation...............: make install (as root if needed, with 'su' or 'sudo')" -echo " prefix...................: $prefix" -echo -echo "Features:" -echo " gettext.............: $have_po" -echo " fuzzing.............: $want_fuzzing" -echo diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 83c45f16..00000000 --- a/data/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = desktop icons images fonts themes backgrounds - diff --git a/data/backgrounds/Makefile.am b/data/backgrounds/Makefile.am deleted file mode 100644 index 2069a4b0..00000000 --- a/data/backgrounds/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -filesdir = $(pkgdatadir)/backgrounds -files_DATA = \ -mystic.png \ -texture_background.png - -EXTRA_DIST = $(files_DATA) diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am deleted file mode 100644 index e9d5fe67..00000000 --- a/data/desktop/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/applications -files_DATA = \ -terminology.desktop - -EXTRA_DIST = $(files_DATA) diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am deleted file mode 100644 index 320621d9..00000000 --- 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/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index e7129068..00000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/icons -files_DATA = \ -terminology.png - -EXTRA_DIST = $(files_DATA) diff --git a/data/images/Makefile.am b/data/images/Makefile.am deleted file mode 100644 index ce6357d1..00000000 --- a/data/images/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(pkgdatadir)/images -files_DATA = \ -terminology.png - -EXTRA_DIST = $(files_DATA) diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am deleted file mode 100644 index d951b355..00000000 --- a/data/themes/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = images sounds nyanology - -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 \ -mild.edj \ -black.edj \ -solarized.edj \ -solarized_light.edj \ -smyck.edj \ -mustang.edj \ -base16_ocean_dark.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 \ -mild.edc \ -black.edc \ -mustang.edc \ -base16_ocean_dark.edc \ -solarized.edc \ -solarized_light.edc \ -smyck.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 - -mild.edj: Makefile mild.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/mild.edc \ - $(top_builddir)/data/themes/mild.edj - -black.edj: Makefile black.edc mild.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/black.edc \ - $(top_builddir)/data/themes/black.edj - -solarized.edj: Makefile solarized.edc default.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/solarized.edc \ - $(top_builddir)/data/themes/solarized.edj - -solarized_light.edj: Makefile solarized_light.edc default.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/solarized_light.edc \ - $(top_builddir)/data/themes/solarized_light.edj - -mustang.edj: Makefile mustang.edc mild.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/mustang.edc \ - $(top_builddir)/data/themes/mustang.edj - -base16_ocean_dark.edj: Makefile base16_ocean_dark.edc mild.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/base16_ocean_dark.edc \ - $(top_builddir)/data/themes/base16_ocean_dark.edj - -smyck.edj: Makefile smyck.edc mild.edc default_colors.in.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/smyck.edc \ - $(top_builddir)/data/themes/smyck.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 11a997e1..00000000 --- a/data/themes/images/Makefile.am +++ /dev/null @@ -1,77 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = \ -ab_base.png \ -ab_shell.png \ -bg_bevel.png \ -bg_shine.png \ -bg_shine2.png \ -bg_shine3.png \ -bg_shine4.png \ -bg_shine5.png \ -bg_glint.png \ -bg_glow_in.png \ -bg_led.png \ -bg_led_base.png \ -bg_led_glow.png \ -bg_led_strobe.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 \ -icon_about.png \ -icon_close.png \ -icon_copy.png \ -icon_new.png \ -icon_paste.png \ -icon_settings.png \ -icon_split_h.png \ -icon_split_v.png \ -icon_miniview.png \ -inset_shadow.png \ -media_bg.png \ -media_line.png \ -media_pause.png \ -media_play.png \ -media_stop.png \ -media_knob_pos.png \ -media_knob_vol.png \ -media_busy_knob.png \ -media_busy_progress.png \ -media_busy_spinner.png \ -pm_fill.png \ -pm_overlay.png \ -pm_shadow.png \ -lk_bottom.png \ -lk_left.png \ -lk_right.png \ -sl_htop.png \ -sl_hbottom.png \ -sl_left.png \ -sl_top.png \ -sl_bottom.png \ -sl_stripe.png \ -sl_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_close.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 diff --git a/data/themes/nyanology/Makefile.am b/data/themes/nyanology/Makefile.am deleted file mode 100644 index edc5cf6f..00000000 --- a/data/themes/nyanology/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = images images-sources - -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/nyanology/images -id $(top_srcdir)/data/themes/images -fd $(top_srcdir)/data/fonts -sd $(top_srcdir)/data/themes/sounds - -filesdir = $(pkgdatadir)/themes -files_DATA = \ -nyanology.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 = \ -README.md \ -about.edc \ -nyancursor.edc \ -nyanology.edc - -nyanology.edj: Makefile nyanology.edc about.edc nyancursor.edc - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/nyanology/nyanology.edc \ - $(top_builddir)/data/themes/nyanology/nyanology.edj - -clean-local: - rm -f *.edj diff --git a/data/themes/nyanology/images-sources/Makefile.am b/data/themes/nyanology/images-sources/Makefile.am deleted file mode 100644 index 2baa757f..00000000 --- a/data/themes/nyanology/images-sources/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = \ -cat01-transparenttail.xcf \ -catonly.xcf \ -star-analysis.xcf \ -star.xcf diff --git a/data/themes/nyanology/images/Makefile.am b/data/themes/nyanology/images/Makefile.am deleted file mode 100644 index 2bd16fc1..00000000 --- a/data/themes/nyanology/images/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = \ -cat01.png \ -cat02.png \ -cat03.png \ -cat04.png \ -cat05.png \ -cat06.png \ -cat07.png \ -cat08.png \ -cat09.png \ -cat10.png \ -cat11.png \ -cat12.png \ -select.png \ -star_1.png \ -star_2.png \ -star_3.png \ -star_4.png \ -star_5.png \ -star_6.png diff --git a/data/themes/sounds/Makefile.am b/data/themes/sounds/Makefile.am deleted file mode 100644 index 68a996fb..00000000 --- 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 23479a92..00000000 --- a/m4/ac_attribute.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl Copyright (C) 2004-2008 Kim Woelders -dnl Copyright (C) 2008 Vincent Torri -dnl That code is public domain and can be freely used or copied. -dnl Originally snatched from somewhere... - -dnl Macro for checking if the compiler supports __attribute__ - -dnl Usage: AC_C___ATTRIBUTE__ -dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__ -dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is -dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused)) -dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is -dnl defined to nothing. - -AC_DEFUN([AC_C___ATTRIBUTE__], -[ - -AC_MSG_CHECKING([for __attribute__]) - -AC_CACHE_VAL([ac_cv___attribute__], - [AC_TRY_COMPILE( - [ -#include - -int func(int x); -int foo(int x __attribute__ ((unused))) -{ - exit(1); -} - ], - [], - [ac_cv___attribute__="yes"], - [ac_cv___attribute__="no"] - )]) - -AC_MSG_RESULT($ac_cv___attribute__) - -if test "x${ac_cv___attribute__}" = "xyes" ; then - AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__]) - AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Macro declaring a function argument to be unused]) - else - AC_DEFINE([__UNUSED__], [], [Macro declaring a function argument to be unused]) -fi - -]) - -dnl End of ac_attribute.m4 diff --git a/m4/efl_beta.m4 b/m4/efl_beta.m4 deleted file mode 100644 index c8047299..00000000 --- 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 c7746881..00000000 --- a/m4/efl_binary.m4 +++ /dev/null @@ -1,71 +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 - -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_eo.m4 b/m4/efl_eo.m4 deleted file mode 100644 index 864baf5f..00000000 --- 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/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 1d4c153b..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -man1_MANS = terminology.1 -EXTRA_DIST = terminology.1 diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index ccfbf1af..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = bin diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am deleted file mode 100644 index 7bd73626..00000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,146 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = terminology tybg tyalpha typop tyq tycat tyls -if ENABLE_FUZZING -bin_PROGRAMS += tyfuzz -endif - -terminology_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -terminology_LDADD = @TERMINOLOGY_LIBS@ -if HAVE_PO -terminology_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" -terminology_LDADD += @LIBINTL@ -endif - - - - -terminology_SOURCES = \ -private.h \ -about.c about.h \ -col.c col.h \ -config.c config.h \ -controls.c controls.h \ -ipc.c ipc.h \ -keyin.c keyin.h \ -main.c main.h \ -media.c media.h \ -options.c options.h \ -options_font.c options_font.h \ -options_theme.c options_theme.h \ -options_themepv.c options_themepv.h \ -options_background.c options_background.h \ -options_colors.c options_colors.h \ -options_behavior.c options_behavior.h \ -options_keys.c options_keys.h \ -options_helpers.c options_helpers.h \ -options_video.c options_video.h \ -options_elm.c options_elm.h \ -sel.c sel.h \ -miniview.c miniview.h \ -termio.c termio.h \ -termcmd.c termcmd.h \ -term_container.h \ -termiolink.c termiolink.h \ -termpty.c termpty.h \ -termptydbl.c termptydbl.h \ -termptyesc.c termptyesc.h \ -termptyops.c termptyops.h \ -termptygfx.c termptygfx.h \ -termptyext.c termptyext.h \ -termptysave.c termptysave.h \ -lz4/lz4.c lz4/lz4.h \ -md5/md5.c md5/md5.h \ -utf8.c utf8.h \ -win.c win.h \ -utils.c utils.h \ -extns.c extns.h \ -gravatar.c gravatar.h \ -tty_keys.h \ -sb.c sb.h - -tybg_SOURCES = \ -tycommon.c tycommon.h \ -tybg.c - -tybg_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -tybg_LDADD = - -tyalpha_SOURCES = \ -tycommon.c \ -tyalpha.c - -tyalpha_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -tyalpha_LDADD = - -typop_SOURCES = \ -tycommon.c \ -typop.c - -typop_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -typop_LDADD = - -tyq_SOURCES = \ -tycommon.c \ -tyq.c - -tyq_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -tyq_LDADD = - -tycat_SOURCES = \ -tycat.c \ -tycommon.c \ -extns.c extns.h - -tycat_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -tycat_LDADD = @TERMINOLOGY_LIBS@ - -tyls_SOURCES = \ -tyls.c \ -tycommon.c \ -extns.h - -tyls_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -tyls_LDADD = @TERMINOLOGY_LIBS@ - -if ENABLE_FUZZING -tyfuzz_SOURCES = \ -termptyesc.c \ -termptysave.c \ -termptyops.c \ -termptydbl.c \ -termptyext.c \ -termptygfx.c \ -termpty.c \ -config.c \ -col.c \ -tyfuzz.c - -tyfuzz_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ - -tyfuzz_LDADD = @TERMINOLOGY_LIBS@ -endif