enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity
efl/src/Makefile_Ecore_X.am

147 lines
4.6 KiB
Plaintext
Raw Normal View History

merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
### Library
lib_LTLIBRARIES += lib/ecore_x/libecore_x.la
installed_ecorexmainheadersdir = $(includedir)/ecore-@VMAJ@
dist_installed_ecorexmainheaders_DATA = \
lib/ecore_x/Ecore_X.h \
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 07:26:27 -08:00
lib/ecore_x/ecore_x_version.h \
merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
lib/ecore_x/Ecore_X_Atoms.h \
lib/ecore_x/Ecore_X_Cursor.h
lib_ecore_x_libecore_x_la_SOURCES = \
ecore: fix distcheck SVN revision: 80030
2012-12-03 01:16:33 -08:00
lib/ecore_x/ecore_x_atoms_decl.h
if HAVE_ECORE_X_XCB
lib_ecore_x_libecore_x_la_SOURCES += \
merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
lib/ecore_x/xcb/ecore_xcb.c \
lib/ecore_x/xcb/ecore_xcb_atoms.c \
lib/ecore_x/xcb/ecore_xcb_extensions.c \
lib/ecore_x/xcb/ecore_xcb_shape.c \
lib/ecore_x/xcb/ecore_xcb_screensaver.c \
lib/ecore_x/xcb/ecore_xcb_sync.c \
lib/ecore_x/xcb/ecore_xcb_render.c \
lib/ecore_x/xcb/ecore_xcb_randr.c \
lib/ecore_x/xcb/ecore_xcb_xfixes.c \
lib/ecore_x/xcb/ecore_xcb_composite.c \
lib/ecore_x/xcb/ecore_xcb_cursor.c \
lib/ecore_x/xcb/ecore_xcb_damage.c \
lib/ecore_x/xcb/ecore_xcb_dnd.c \
lib/ecore_x/xcb/ecore_xcb_dpms.c \
lib/ecore_x/xcb/ecore_xcb_drawable.c \
lib/ecore_x/xcb/ecore_xcb_e.c \
lib/ecore_x/xcb/ecore_xcb_gc.c \
lib/ecore_x/xcb/ecore_xcb_image.c \
lib/ecore_x/xcb/ecore_xcb_input.c \
lib/ecore_x/xcb/ecore_xcb_gesture.c \
lib/ecore_x/xcb/ecore_xcb_mwm.c \
lib/ecore_x/xcb/ecore_xcb_pixmap.c \
lib/ecore_x/xcb/ecore_xcb_region.c \
lib/ecore_x/xcb/ecore_xcb_selection.c \
lib/ecore_x/xcb/ecore_xcb_textlist.c \
lib/ecore_x/xcb/ecore_xcb_events.c \
lib/ecore_x/xcb/ecore_xcb_keymap.c \
lib/ecore_x/xcb/ecore_xcb_netwm.c \
lib/ecore_x/xcb/ecore_xcb_icccm.c \
lib/ecore_x/xcb/ecore_xcb_window.c \
lib/ecore_x/xcb/ecore_xcb_window_prop.c \
lib/ecore_x/xcb/ecore_xcb_window_shape.c \
lib/ecore_x/xcb/ecore_xcb_window_shadow.c \
lib/ecore_x/xcb/ecore_xcb_xinerama.c \
lib/ecore_x/xcb/ecore_xcb_error.c \
lib/ecore_x/xcb/ecore_xcb_xtest.c \
lib/ecore_x/xcb/ecore_xcb_vsync.c \
lib/ecore_x/xcb/ecore_xcb_xdefaults.c \
lib/ecore_x/xcb/ecore_xcb_private.h
else
ecore: fix distcheck SVN revision: 80030
2012-12-03 01:16:33 -08:00
lib_ecore_x_libecore_x_la_SOURCES += \
merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
lib/ecore_x/xlib/ecore_x.c \
lib/ecore_x/xlib/ecore_x_dnd.c \
lib/ecore_x/xlib/ecore_x_sync.c \
lib/ecore_x/xlib/ecore_x_randr.c \
lib/ecore_x/xlib/ecore_x_randr_11.c \
lib/ecore_x/xlib/ecore_x_randr_12.c \
lib/ecore_x/xlib/ecore_x_randr_12_edid.c \
lib/ecore_x/xlib/ecore_x_randr_13.c \
lib/ecore_x/xlib/ecore_x_fixes.c \
lib/ecore_x/xlib/ecore_x_damage.c \
lib/ecore_x/xlib/ecore_x_composite.c \
lib/ecore_x/xlib/ecore_x_error.c \
lib/ecore_x/xlib/ecore_x_events.c \
lib/ecore_x/xlib/ecore_x_icccm.c \
lib/ecore_x/xlib/ecore_x_netwm.c \
lib/ecore_x/xlib/ecore_x_mwm.c \
lib/ecore_x/xlib/ecore_x_e.c \
lib/ecore_x/xlib/ecore_x_selection.c \
lib/ecore_x/xlib/ecore_x_window.c \
lib/ecore_x/xlib/ecore_x_window_prop.c \
lib/ecore_x/xlib/ecore_x_window_shape.c \
lib/ecore_x/xlib/ecore_x_pixmap.c \
lib/ecore_x/xlib/ecore_x_gc.c \
lib/ecore_x/xlib/ecore_x_xinerama.c \
lib/ecore_x/xlib/ecore_x_screensaver.c \
lib/ecore_x/xlib/ecore_x_dpms.c \
lib/ecore_x/xlib/ecore_x_drawable.c \
lib/ecore_x/xlib/ecore_x_cursor.c \
lib/ecore_x/xlib/ecore_x_test.c \
lib/ecore_x/xlib/ecore_x_atoms.c \
lib/ecore_x/xlib/ecore_x_region.c \
lib/ecore_x/xlib/ecore_x_image.c \
lib/ecore_x/xlib/ecore_x_xi2.c \
lib/ecore_x/xlib/ecore_x_vsync.c \
lib/ecore_x/xlib/ecore_x_randr.h \
lib/ecore_x/xlib/ecore_x_gesture.c \
lib/ecore_x/xlib/ecore_x_private.h
endif
lib_ecore_x_libecore_x_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
cleaning: remove unneeded $(top_builddir) SVN revision: 81324
2012-12-18 23:17:32 -08:00
-I$(top_builddir)/src/lib/eina \
merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
-I$(top_srcdir)/src/lib/eo \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_input \
-I$(top_srcdir)/src/lib/ecore_x \
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 07:41:06 -08:00
-I$(top_builddir)/src/lib/ecore_x \
merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
-DEFL_ECORE_X_BUILD \
@EFL_CFLAGS@ \
@EFL_COV_CFLAGS@ \
@ECORE_X_CFLAGS@
lib_ecore_x_libecore_x_la_LIBADD = \
lib/ecore_input/libecore_input.la \
lib/ecore/libecore.la \
lib/eo/libeo.la \
lib/eina/libeina.la \
@ECORE_X_LIBS@
lib_ecore_x_libecore_x_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
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 07:26:27 -08:00
MAINTAINERCLEANFILES += \
$(top_builddir)/src/lib/ecore_x/ecore_x_version.h
BUILT_SOURCES += \
$(top_builddir)/src/lib/ecore_x/ecore_x_version.h
efl: generate keysym table for xcb SVN revision: 80502
2012-12-07 14:50:06 -08:00
if HAVE_ECORE_X_XCB
MAINTAINERCLEANFILES += \
$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h \
$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h
BUILT_SOURCES += \
$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h: $(KEYSYMDEFS) $(top_builddir)/src/utils/ecore/makekeys$(EXEEXT)
$(top_builddir)/src/utils/ecore/makekeys $(KEYSYMDEFS) > $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h
mv -f $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
endif
merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
### Utils
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 15:04:40 -08:00
noinst_PROGRAMS += utils/ecore/makekeys
merge: add escape ecore, fix several bugs SVN revision: 79995
2012-12-02 14:35:45 -08:00
utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
EXTRA_DIST += utils/ecore/mkks.sh