okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=6eb4616015993ff01f872a3cc61c0de63d5c00c0
commit 6eb4616015993ff01f872a3cc61c0de63d5c00c0 Author: Stephen 'Okra' Houston <[email protected]> Date: Wed Sep 13 10:38:50 2017 -0500 Ephoto: Replace autofoo with meson --- COPYING | 2 +- ChangeLog | 2 - INSTALL | 377 ++++--------------------------------------- Makefile.am | 75 --------- NEWS | 45 ------ autogen.sh | 41 +---- configure.ac | 116 ------------- data/Makefile.am | 2 - data/desktop/Makefile.am | 9 -- data/desktop/meson.build | 2 + data/images/Makefile.am | 7 - data/images/meson.build | 4 + data/meson.build | 3 + data/themes/Makefile.am | 23 --- data/themes/ephoto.edc | 20 +-- data/themes/meson.build | 13 ++ data/themes/perms.sh | 3 + m4/ac_attribute.m4 | 47 ------ m4/efl.m4 | 123 -------------- m4/efl_binary.m4 | 71 -------- m4/efl_tests.m4 | 65 -------- meson.build | 71 ++++++++ meson_options.txt | 4 + po/meson.build | 6 + src/Makefile.am | 5 - src/bin/Makefile.am | 79 --------- src/bin/ephoto.h | 12 +- src/bin/ephoto_config.c | 2 +- src/bin/ephoto_thumbnailer.c | 2 - src/bin/meson.build | 41 +++++ src/meson.build | 1 + 31 files changed, 199 insertions(+), 1074 deletions(-) diff --git a/COPYING b/COPYING index b0e6fa1..6adb4f2 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (C) 2000-2016 Stephen Houston +Copyright (C) 2000-2017 Stephen Houston All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 8c1c87e..0000000 --- a/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -Ephoto - A comprehensive image viewer written using the core EFL. -First release of Ephoto - Version 1.0 Beta diff --git a/INSTALL b/INSTALL index a1e89e1..3e797a1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,370 +1,59 @@ -Installation Instructions -************************* +** COMPILING and INSTALLING ** +------------------------------ -Copyright (C) 1994-1996, 1999-2002, 2004-2011 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. - - 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. - - 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 `<wchar.h>' 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 bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /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. +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 3bbf2e9..0000000 --- a/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -MAINTAINERCLEANFILES = \ -ABOUT-NLS* \ -Makefile.in \ -$(PACKAGE_TARNAME)-$PACKAGE_VERSION).tar.gz \ -$(PACKAGE_TARNAME)-$PACKAGE_VERSION).tar.xz \ -acconfig.h \ -aclocal.m4 \ -compile \ -config.guess \ -config.h.in \ -config.rpath \ -config.sub \ -configure \ -depcomp \ -install-sh \ -ltconfig \ -ltmain.sh \ -missing \ -mkinstalldirs \ -stamp-h.in \ -stamp-h - -if HAVE_PO -MAINTAINERCLEANFILES += \ -m4/codeset.m4 \ -m4/gettext.m4 \ -m4/glibc21.m4 \ -m4/iconv.m4 \ -m4/intdiv0.m4 \ -m4/inttypes.m4 \ -m4/inttypes_h.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/libtool.m4 \ -m4/lt~obsolete.m4 \ -m4/ltoptions.m4 \ -m4/ltsugar.m4 \ -m4/ltversion.m4 \ -m4/nls.m4 \ -m4/po.m4 \ -m4/progtest.m4 \ -m4/stdint_h.m4 \ -m4/uintmax_t.m4 \ -m4/ulonglong.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 - -# no idea why this is required, it should not be: -DISTCLEANFILES = po/stamp-po - -endif - -SUBDIRS = src data - -if HAVE_PO -SUBDIRS += po -endif - -EXTRA_DIST = README AUTHORS COPYING autogen.sh ephoto.spec - -ACLOCAL_AMFLAGS = -I m4 - -filesdir = $(datadir)/ephoto/ -files_DATA = AUTHORS COPYING diff --git a/NEWS b/NEWS deleted file mode 100644 index 26c2d2c..0000000 --- a/NEWS +++ /dev/null @@ -1,45 +0,0 @@ -Ephoto is located in git at https://git.enlightenment.org/apps/ephoto.git -You can gather more location from http://www.smhouston.us/ephoto/ - -Ephoto 1.0 Beta 2: -Highlights: - * Improve stability - * Many Fixes - -Fixes: -Author: Stephen okra Houston <[email protected]> - Ephoto: Add an exit icon to the control bar. Update slideshow icons. Use efreet for XDG. - Ephoto: Add back in sorting by image similarity, this time with the crashing and bugs eliminated. - Ephoto: add small icon - Ephoto: Add sorting by image similarity. - Ephoto: Better checking for XDG_CONFIG_HOME. - Ephoto: Check for null on returning text in the editor genlist. - Ephoto: Custom icon. - Ephoto: Don't allow escape to return to the thumb view when the editor is open. - Ephoto: Don't disable/enable similarity sorting now that sorting mode is retained. - Ephoto: Don't disable the similarity sorting at the wrong time. - Ephoto: Don't switch directory when genlist is clicked but an item is not (i.e.. scrolling) - Ephoto: Don't warn, as this behavior is perfectly normal. - Ephoto: Enable rotating from the right click menu in single view. - Ephoto: Fix a monitor bug. - Ephoto: Fix some warnings and potential crashes. Improve safety checking. - Ephoto: Fix tooltips causing box to lose sizing. - Ephoto: Fix up single browser right click menu. - Ephoto: Install thumbnailer to the lib directory. - Ephoto: Make sure titlebar text is accurate and show as modified in the titlebar when the image has been edited. - Ephoto: oops. Put the . in the correct place in the thumbnail dir. - Ephoto: Remember similarity sorting on dir change. - Ephoto: Remove warnings and potential crash by unsetting the fileselector from the popup before deleting. - Ephoto: Replace another direct_ls with stat_ls - Ephoto: Require EFL 1.18. - Ephoto: Save thumbnails in $HOME/.thumbnails - Ephoto: Select and bring in the current item when going from single view to thumb view. - Ephoto: The directory chosen in the config panel should be the root directory, not actually / - Ephoto: Update config about with new image. - Ephoto: Update label for config directory setting. Fix crash while changing directories in single view. - Ephoto: Update spec. - Ephoto: Update thumb dir to be .cache/ephoto/thumbnails/ .. Use XDG_CONFIG_HOME if available, else use HOME/.config - Ephoto: Update year in copyright. - EPhoto: Use eina_file_stat_ls as eina_file_direct_ls does not work on bsd. - Ephoto: Use new indent style on the genlist non tree items. - Ephoto: USE XDG_CACHE_HOME/ephoto/thumbnails if XDG_CACHE_HOME exists, otherwise use $HOME/.cache/ephoto/thumbnails diff --git a/autogen.sh b/autogen.sh index b814903..6531487 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 3a95c9e..0000000 --- a/configure.ac +++ /dev/null @@ -1,116 +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([ephoto], [1.5], [[email protected]]) - -AC_PREREQ([2.60]) -AC_CONFIG_SRCDIR([configure.ac]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_HEADERS(src/bin/config.h) - -AC_CANONICAL_HOST - -have_win32="no" -case "$host_os" in - mingw*) - have_win32="yes" - ;; -esac - -AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"]) - -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__ - -AC_CHECK_HEADERS([dirent.h limits.h math.h arpa/inet.h netinet/in.h]) - -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="eina >= 1.18.0 evas >= 1.18.0 ecore >= 1.18.0 ecore-file >= -1.18.0 ecore-ipc >= 1.18.0 edje >= 1.18.0 eo >= 1.18.0 eio >= 1.18.0 -elementary >= 1.18.0 efreet-mime >= 1.18.0" - -if test "x${have_win32}" = "xyes" ; then - requirements="${requirements} evil" -fi - -PKG_CHECK_MODULES([EFL], [${requirements}]) - -AC_CHECK_FUNCS([nice]) - -AC_ARG_WITH([tests], - [AC_HELP_STRING([--with-tests=none|regular|coverage], - [choose testing method: regular, coverage, or none. - @<:@default=none:>@])], - [build_tests=${withval}], - [build_tests=auto]) - -EFL_TESTS([${build_tests}]) - -EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) - -AC_CONFIG_FILES([ -ephoto.spec -]) - -AC_OUTPUT([ -Makefile -data/Makefile -data/desktop/Makefile -data/images/Makefile -data/themes/Makefile -src/Makefile -src/bin/Makefile -$po_makefile_in -]) - - -########################################################################### -## Info - -echo -echo -echo -echo "------------------------------------------------------------------------" -echo "$PACKAGE_NAME $PACKAGE_VERSION" -echo "------------------------------------------------------------------------" -echo -echo "Host.....................: ${host_os}" -echo -echo "Compilation..............: make (or gmake)" -echo " CPPFLAGS...............: $CPPFLAGS" -echo " CFLAGS.................: $CFLAGS" -echo " LDFLAGS................: $LDFLAGS" -echo -echo "Building tests...........: ${have_tests}" -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 d7b8c58..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in Makefile -SUBDIRS = desktop themes images diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am deleted file mode 100644 index 9d79b7c..0000000 --- a/data/desktop/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -MAINTAINERCLEANFILES = Makefile.in Makefile - -desktopdir = $(datadir)/applications -desktop_DATA = ephoto.desktop -icondir = $(datadir)/pixmaps -icon_DATA = ephoto.png - -EXTRA_DIST = ephoto.desktop ephoto.png ephoto_small.png diff --git a/data/desktop/meson.build b/data/desktop/meson.build new file mode 100644 index 0000000..2b4c22d --- /dev/null +++ b/data/desktop/meson.build @@ -0,0 +1,2 @@ +install_data('ephoto.desktop', + install_dir: join_paths(dir_data, 'applications')) diff --git a/data/images/Makefile.am b/data/images/Makefile.am deleted file mode 100644 index dfad797..0000000 --- a/data/images/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -MAINTAINERCLEANFILES = Makefile.in Makefile - -EXTRA_DIST = ephoto.png grid.png single.png - -filesdir = $(datadir)/$(PACKAGE)/images -files_DATA = ephoto.png grid.png single.png diff --git a/data/images/meson.build b/data/images/meson.build new file mode 100644 index 0000000..0764532 --- /dev/null +++ b/data/images/meson.build @@ -0,0 +1,4 @@ +install_data('ephoto.png', + 'grid.png', + 'single.png', + install_dir: join_paths(dir_data, 'icons')) diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..b3217e0 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,3 @@ +subdir('desktop') +subdir('images') +subdir('themes') diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am deleted file mode 100644 index f8f7be2..0000000 --- a/data/themes/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -MAINTAINERCLEANFILES = Makefile.in Makefile - -EDJE_CC = @edje_cc@ -EDJE_FLAGS = -id $(top_srcdir)/data/themes - -filesdir = $(datadir)/$(PACKAGE)/themes -files_DATA = ephoto.edj - -EXTRA_DIST = ephoto.edc \ - images/sel_border.png \ - images/sel_corner1.png \ - images/sel_corner3.png \ - images/sel_corner5.png \ - images/sel_corner7.png - -ephoto.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/ephoto.edc \ - $(top_builddir)/data/themes/ephoto.edj - -clean-local: - rm -f *.edj diff --git a/data/themes/ephoto.edc b/data/themes/ephoto.edc index d3470ab..b0a3df4 100644 --- a/data/themes/ephoto.edc +++ b/data/themes/ephoto.edc @@ -3,11 +3,11 @@ collections { images { - image: "images/sel_border.png" COMP; - image: "images/sel_corner1.png" COMP; - image: "images/sel_corner3.png" COMP; - image: "images/sel_corner5.png" COMP; - image: "images/sel_corner7.png" COMP; + image: "sel_border.png" COMP; + image: "sel_corner1.png" COMP; + image: "sel_corner3.png" COMP; + image: "sel_corner5.png" COMP; + image: "sel_corner7.png" COMP; } group { "elm/label/base/info"; mouse_events: 0; @@ -1211,7 +1211,7 @@ collections { description { state: "default" 0.0; color: 255 255 255 200; image { - normal: "images/sel_border.png"; + normal: "sel_border.png"; border: 3 3 3 3; middle: NONE; } @@ -1238,7 +1238,7 @@ collections { rel1.offset: 1 1; align: 0.0 0.0; color: 255 255 255 0; - image.normal: "images/sel_corner1.png"; + image.normal: "sel_corner1.png"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -1273,7 +1273,7 @@ collections { rel2.offset: -2 -1; align: 1.0 0.0; color: 255 255 255 0; - image.normal: "images/sel_corner3.png"; + image.normal: "sel_corner3.png"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -1307,7 +1307,7 @@ collections { rel2.offset: -2 -2; align: 1.0 1.0; color: 255 255 255 0; - image.normal: "images/sel_corner5.png"; + image.normal: "sel_corner5.png"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -1342,7 +1342,7 @@ collections { rel2.offset: -1 -2; align: 0.0 1.0; color: 255 255 255 0; - image.normal: "images/sel_corner7.png"; + image.normal: "sel_corner7.png"; } description { state: "visible" 0.0; inherit: "default" 0.0; diff --git a/data/themes/meson.build b/data/themes/meson.build new file mode 100644 index 0000000..91afa24 --- /dev/null +++ b/data/themes/meson.build @@ -0,0 +1,13 @@ +cmd = [ edje_cmd, + '-id', join_paths(meson.source_root(), 'data' , 'themes', 'images'), + '@INPUT@', '@OUTPUT@' + ] +src = 'ephoto' +custom_target(src + '.edj', + input : src + '.edc', + output : src + '.edj', + command : cmd, + install_dir: join_paths(dir_data, proj, 'themes'), + install : true + ) +meson.add_install_script('perms.sh') diff --git a/data/themes/perms.sh b/data/themes/perms.sh new file mode 100644 index 0000000..cc6db9c --- /dev/null +++ b/data/themes/perms.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +chmod a+r "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/ephoto/themes/ephoto.edj" diff --git a/m4/ac_attribute.m4 b/m4/ac_attribute.m4 deleted file mode 100644 index 23479a9..0000000 --- a/m4/ac_attribute.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl Copyright (C) 2004-2008 Kim Woelders -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 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 <stdlib.h> - -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.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 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_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/meson.build b/meson.build new file mode 100644 index 0000000..01ddeed --- /dev/null +++ b/meson.build @@ -0,0 +1,71 @@ +##### project +project('ephoto', 'c', + version : '1.5', + license : 'BSD 2 clause', + default_options: [ 'c_std=gnu99' ], + meson_version : '>= 0.40.0') +base_url = 'https://www.enlightenment.org/about-' + +##### convenience variables for later +proj = meson.project_name() +ver = meson.project_version() +cfg = configuration_data() + +##### dependencies +efl_version = '>= 1.19.0' +elm = dependency('elementary', required: true, version: efl_version) +edje = dependency('edje', required: true, version: efl_version) +eipc = dependency('ecore-ipc', required: true, version: efl_version) +##### check for windows dependency +if build_machine.system() == 'windows' + win = dependency('evil', version: efl_version) +endif + +##### dir locations +dir_prefix = get_option('prefix') +dir_bin = join_paths(dir_prefix, get_option('bindir')) +dir_lib = join_paths(dir_prefix, get_option('libdir')) +dir_data = join_paths(dir_prefix, get_option('datadir')) +dir_locale = join_paths(dir_prefix, get_option('localedir')) + +##### get C compiler +cc = meson.get_compiler('c') + +##### get edje command +edje_cmd = join_paths(edje.get_pkgconfig_variable('prefix'), + 'bin', 'edje_cc') +##### translations +if get_option('nls') == true + subdir('po') +endif +##### config.h +cfg.set_quoted('PACKAGE' , proj) +cfg.set_quoted('PACKAGE_NAME' , proj) +cfg.set_quoted('PACKAGE_VERSION' , ver) +cfg.set_quoted('PACKAGE_STRING' , proj + ' ' + ver) +cfg.set_quoted('PACKAGE_URL' , base_url + proj) +cfg.set_quoted('PACKAGE_BIN_DIR' , dir_bin) +cfg.set_quoted('PACKAGE_LIB_DIR' , dir_lib) +cfg.set_quoted('PACKAGE_DATA_DIR' , join_paths(dir_data, proj)) +cfg.set_quoted('LOCALEDIR' , dir_locale) +cfg.set ('_GNU_SOURCE' , 1) +cfg.set ('__EXTENSIONS__' , 1) +cfg.set ('_POSIX_PTHREAD_SEMANTICS', 1) +cfg.set ('_ALL_SOURCE' , 1) +cfg.set ('_POSIX_SOURCE' , 1) +cfg.set ('_POSIX_1_SOURCE' , 1) +##### Check for windows +if build_machine.system() == 'windows' + cfg.set ('_WIN32' , 1) +endif +##### Check for arpa/inet and netinet/in.h +if cc.has_header('arpa/inet.h') == true + cfg.set ('HAVE_ARPA_INET_H' , 1) +endif +if cc.has_header('netinet/in.h') == true + cfg.set ('HAVE_NETINET_IN_H' , 1) +endif +configure_file(output: 'config.h', configuration: cfg) + +subdir('src') +subdir('data') diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..bc7316b --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,4 @@ +option('nls', + type: 'boolean', + default: true, + description: 'enable localization: (default=true)') diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..e9bd647 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,6 @@ +if get_option('nls') + i18n = import('i18n') + i18n.gettext('ephoto') + cfg = configuration_data() + cfg.set('HAVE_GETTEXT', '1') +endif diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 5f56980..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to produce Makefile.in - -MAINTAINERCLEANFILES = Makefile.in Makefile - -SUBDIRS = bin diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am deleted file mode 100644 index 1d20fc2..0000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -MAINTAINERCLEANFILES = *.gcda *.gcno *.o config.h.in config.h Makefile.in Makefile stamp-h1 -DISTCLEANFILES = *.gcda *.gcno - -bin_PROGRAMS = ephoto - -ephoto_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/bin \ - -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - -DPACKAGE_LIB_DIR=\"$(libdir)/$(PACKAGE)\" \ - -Wall \ - -Wextra \ - -Wshadow \ - @EFL_CFLAGS@ -ephoto_LDADD = @EFL_LIBS@ -if HAVE_PO -ephoto_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" -ephoto_LDADD += @LIBINTL@ -endif - -ephoto_SOURCES = \ - ephoto.c \ - ephoto_bcg.c \ - ephoto_color.c \ - ephoto_config.c \ - ephoto_cropper.c \ - ephoto_directory_browser.c \ - ephoto_editor.c \ - ephoto_file.c \ - ephoto_filters.c \ - ephoto_hsv.c \ - ephoto_ipc.c \ - ephoto_main.c \ - ephoto_red_eye.c \ - ephoto_scale.c \ - ephoto_single_browser.c \ - ephoto_slideshow.c \ - ephoto_thumb.c \ - ephoto_thumb_browser.c - -internal_bindir = $(libdir)/$(PACKAGE) -internal_bin_PROGRAMS = ephoto_thumbnail - -ephoto_thumbnail_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/bin \ - -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - -DPACKAGE_LIB_DIR=\"$(libdir)/$(PACKAGE)\" \ - -Wall \ - -Wextra \ - -Wshadow \ - -Wdeclaration-after-statement \ - -Wmissing-prototypes \ - -Wstrict-prototypes \ - -Wpointer-arith \ - -Wno-missing-field-initializers \ - -fvisibility=hidden \ - -fdata-sections \ - -ffunction-sections \ - @EFL_CFLAGS@ - -ephoto_thumbnail_LDADD = @EFL_LIBS@ - -if HAVE_WIN32 -ephoto_thumbnail_LDADD += -lws2_32 -endif - -if HAVE_PO -ephoto_thumbnail_LDADD += @LIBINTL@ -endif - -ephoto_thumbnail_SOURCES = \ - ephoto_thumbnailer.c \ - ephoto_ipc.c \ - ephoto_thumb.c - -noinst_HEADERS = ephoto.h -EXTRA_DIST = ephoto.h diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h index 92af7a2..0aac36b 100644 --- a/src/bin/ephoto.h +++ b/src/bin/ephoto.h @@ -1,10 +1,7 @@ #ifndef _EPHOTO_H_ # define _EPHOTO_H_ -# ifdef HAVE_CONFIG_H -# include "config.h" -# endif - +# include "config.h" # include <stdio.h> # include <stdlib.h> # include <string.h> @@ -25,11 +22,8 @@ # include <Evas.h> # include <Eio.h> -# ifdef HAVE_PO -# include <locale.h> -# endif - -#if HAVE_GETTEXT && ENABLE_NLS +#if HAVE_GETTEXT +# include <locale.h> # include <libintl.h> # define _(string) gettext(string) #else diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c index 93f4ed8..53797d1 100644 --- a/src/bin/ephoto_config.c +++ b/src/bin/ephoto_config.c @@ -504,7 +504,7 @@ _config_about(Evas_Object *parent) elm_box_pack_end(box, img); evas_object_show(img); - snprintf(ver, PATH_MAX, "<hilight><b>Ephoto<br/>Version: %s</b></hilight>", VERSION); + snprintf(ver, PATH_MAX, "<hilight><b>Ephoto<br/>Version: %s</b></hilight>", PACKAGE_VERSION); lbl = elm_label_add(box); elm_object_text_set(lbl, ver); diff --git a/src/bin/ephoto_thumbnailer.c b/src/bin/ephoto_thumbnailer.c index 0b335ad..11c03d7 100644 --- a/src/bin/ephoto_thumbnailer.c +++ b/src/bin/ephoto_thumbnailer.c @@ -66,7 +66,6 @@ main(int argc, } else if (!strncmp(argv[i], "--nice=", 7)) { -#ifdef HAVE_NICE const char *val; val = argv[i] + 7; @@ -74,7 +73,6 @@ main(int argc, { if (nice(atoi(val)) < 0) perror("nice"); } -#endif } } diff --git a/src/bin/meson.build b/src/bin/meson.build new file mode 100644 index 0000000..fe87d16 --- /dev/null +++ b/src/bin/meson.build @@ -0,0 +1,41 @@ +inc = include_directories('.', '../..') +deps = [ + elm, + edje, + eipc +] +executable('ephoto', [ + 'ephoto.c', + 'ephoto.h', + 'ephoto_bcg.c', + 'ephoto_color.c', + 'ephoto_config.c', + 'ephoto_cropper.c', + 'ephoto_directory_browser.c', + 'ephoto_editor.c', + 'ephoto_file.c', + 'ephoto_filters.c', + 'ephoto_hsv.c', + 'ephoto_ipc.c', + 'ephoto_main.c', + 'ephoto_red_eye.c', + 'ephoto_scale.c', + 'ephoto_single_browser.c', + 'ephoto_slideshow.c', + 'ephoto_thumb_browser.c', + 'ephoto_thumb.c' + ], + include_directories: inc, + dependencies : deps, + gui_app : true, + install : true) + +executable('ephoto_thumbnail', [ + 'ephoto_ipc.c', + 'ephoto_thumbnailer.c', + 'ephoto_thumb.c' + ], + include_directories: inc, + dependencies : deps, + install_dir : join_paths(dir_lib, proj), + install : true) diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..2ca5545 --- /dev/null +++ b/src/meson.build @@ -0,0 +1 @@ +subdir('bin') --
