Commit Graph

13 Commits

Author SHA1 Message Date
Gustavo Sverzut Barbieri 57090b2abb efl: improve X detection by Joel Klinghed.
* Split out ecore_imf_xim to do its own check

* Fixed problem with xcb's makekeys, no rule for
  $(top_builddir)/src/utils/ecore/makekeys$(EXEEXT) exists so make
  used an implicit rule (ignoring any cflags of course)

* Fixed gl_x11 engine to build with either Xlib or XCB (xcb flags were
  missing)

* Added EFL_FIND_X and replace any used of AC_PATH_X{,TRA}.  First
  looks for Xorg pkg-config files then if those arn't found it falls
  back to old AC_PATH_X. Also generalized common header and lib
  checks.  Could probably use some polishing (the AC_CACHE_VAL cruft
  especially) but this is what I have time for tonight.

Now X11 should be found on non-standard locations by means of xmkmf,
--x-includes/--x-libraries and also pkg-config.



SVN revision: 82475
2013-01-09 16:48:40 +00:00
Gustavo Sverzut Barbieri 2b29626d8d efl: fix make dist.
Carefully compared 'svn export' and 'make dist' results and couple of
files were missing.

Changes:

 * Makefile.am: removed all .pc from EXTRA_DIST, we shouldn't
   distribute them here as they will contain ./configure data such as
   install location.
 * src/Makefile.am: moved all if-endif to files, otherwise EXTRA_DIST
   won't work properly. We must EXTRA_DIST outside of the if-endif
   block.
 * static_libs/liblinebreak: removed couple of unused files.




SVN revision: 82241
2013-01-04 20:55:12 +00:00
Gustavo Sverzut Barbieri df1b3d30c4 efl: refactor CFLAGS, LIBS, LIBADD and LDADD usage.
- remove EFL_LIBS and EFL_CFLAGS, use per-lib values that inherit
   from EFL (general)

 - add NAME_LDFLAGS and EFL_LDFLAGS for linker flags.

 - LDADD (binaries) now use NAME_LDFLAGS instead of NAME_LIBS, as they
   link to libname.la and that will pull in the libtool dependencies



SVN revision: 81915
2012-12-31 00:46:14 +00:00
Gustavo Sverzut Barbieri 493f9a9ff9 efl: unify LDFLAGS for LTLIBRARIES
SVN revision: 81911
2012-12-30 22:15:29 +00:00
Gustavo Sverzut Barbieri 4bc0210bd3 efl: merge efreet.
seems to be fine, pass distcheck and friends. please report.

changes:
 - documentation hierarchy fixes
 - replaced __UNUSED__ with EINA_UNUSED
 - replaced PKG_DATA_DIR with PACKAGE_DATA_DIR"/efreet"



SVN revision: 81889
2012-12-29 23:04:40 +00:00
Vincent Torri ef2ca5b931 cleaning: remove unneeded $(top_builddir)
SVN revision: 81324
2012-12-19 07:17:32 +00:00
Carsten Haitzler 7470edfa5a sorry vincent. i know you dont like thus, but with this commit efl
tree simply is broken and doesnt compile. error here:

...
src/Makefile_Evas.am:1809: unterminated conditionals: HAVE_WINDOWS_TRUE
src/Makefile.am:24:   src/Makefile_Evas.am' included from here
src/Makefile.am:128: unterminated conditionals: HAVE_WINDOWS_TRUE
src/Makefile.am: installing ./depcomp'
automake: ####################
automake: ## Internal Error ##
automake: ####################
automake: undefined condition TRUE' for RECURSIVE_TARGETS'
automake: RECURSIVE_TARGETS:
automake:   {
automake:     HAVE_WINDOWS => {
automake:       type: +=
automake:       where: /usr/share/automake-1.11/am/texinfos.am:
automake:       comment:
automake:       value: dvi-recursive html-recursive info-recursive
pdf-recursive ps-recursive \
automake:   install-dvi-recursive \
automake:   install-html-recursive \
automake:   install-info-recursive \
automake:   install-pdf-recursive \
automake:   install-ps-recursive all-recursive check-recursive
installcheck-recursive
automake:       owner: Automake
automake:     }
automake:   }
automake:
automake: Please contact <bug-automake@gnu.org>.
 at /usr/share/automake-1.11/Automake/Channels.pm line 657
         Automake::Channels::msg('automake', '', 'undefined condition
TRUE\' for RECURSIVE_TARGETS\'\x{a}RECURSIV...') called at
/usr/share/automake-1.11/Automake/ChannelDefs.pm line 208
        Automake::ChannelDefs::prog_error('undefined condition TRUE\'
for RECURSIVE_TARGETS\'\x{a}RECURSIV...') called at
/usr/share/automake-1.11/Automake/Item.pm line 94
        Automake::Item::rdef('Automake::Variable=HASH(0x38cbe20)',
'Automake::Condition=HASH(0x2832a48)') called at /usr/bin/automake
line 4102
        Automake::handle_subdirs() called at /usr/bin/automake line 8305
                Automake::generate_makefile('src/Makefile.am',
'src/Makefile.in') called at /usr/bin/automake line 8602
        Automake::handle_makefile('src/Makefile.in') called at
/usr/bin/automake line 8616
        Automake::handle_makefiles_serial() called at
/usr/bin/automake line 8769
autoreconf: automake failed with exit status: 255
...

i looked at the HAVE_WINDOWS if's and it seems fine to me - i couldnt
find what was missing, so i had to resort to a revert instead of fix :(
sorry :(



SVN revision: 81267
2012-12-18 15:41:06 +00:00
Vincent Torri 7b944729bb no need to search headers in builddir
SVN revision: 81258
2012-12-18 15:11:51 +00:00
Rui Seabra 3a27a91046 Since it's now AC_OUTPUT'ed, ecore_x_version.h does not need to be generated by sed.
SVN revision: 80626
2012-12-10 23:05:16 +00:00
Gustavo Sverzut Barbieri f8c480fc83 efl/ecore_x: add version and backend to header file.
instead of -DHAVE_ECORE_X_XCB in the pc, which is a super-hack, add a
proper compile-time generated ecore_x_version.h that is included by
Ecore_X.h

This file contains HAVE_ECORE_X_XLIB or HAVE_ECORE_X_XCB defined and
will also define ECORE_X_VERSION_MAJOR and ECORE_X_VERSION_MINOR as
per other EFL (Ecore), also defining the runtime version in
Ecore_X_Version.



SVN revision: 80524
2012-12-08 15:26:27 +00:00
Gustavo Sverzut Barbieri ecadf8759c efl: generate keysym table for xcb
SVN revision: 80502
2012-12-07 22:50:06 +00:00
Vincent Torri bb126da576 ecore: fix distcheck
SVN revision: 80030
2012-12-03 09:16:33 +00:00
Vincent Torri 7d6010b12c merge: add escape ecore, fix several bugs
SVN revision: 79995
2012-12-02 22:35:45 +00:00