X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2FMakefile.mk;h=379331188d92c2c4ca90ce5ef92fe655bbabf8bc;hb=4d7db402eea0b38277fd6d074e65e4fe14755bab;hp=9083b73f580a56e00844ab2c4fd67dcff3855e5f;hpb=dc4e619dea04f1e94b493450a3038d46a981a149;p=platform%2Fupstream%2Fenlightenment.git

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 9083b73..3793311 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -11,6 +11,7 @@ E_CPPFLAGS = \
 @EDJE_DEF@ \
 @WAYLAND_CFLAGS@ \
 @WAYLAND_EGL_CFLAGS@ \
+@WAYLAND_TBM_CFLAGS@ \
 -DE_BINDIR=\"$(bindir)\" \
 -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
 -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
@@ -23,16 +24,20 @@ src/bin/enlightenment \
 src/bin/enlightenment_imc \
 src/bin/enlightenment_start \
 src/bin/enlightenment_filemanager \
-src/bin/enlightenment_open
+src/bin/enlightenment_open \
+src/bin/enlightenment_info
 
 internal_bindir = $(libdir)/enlightenment/utils
 internal_bin_PROGRAMS = \
 src/bin/enlightenment_fm_op \
 src/bin/enlightenment_sys \
 src/bin/enlightenment_thumb \
-src/bin/enlightenment_alert \
 src/bin/enlightenment_static_grabber
 
+if ! HAVE_WAYLAND_ONLY
+internal_bin_PROGRAMS += src/bin/enlightenment_alert
+endif
+
 if HAVE_EEZE
 internal_bin_PROGRAMS += src/bin/enlightenment_backlight
 endif
@@ -47,8 +52,6 @@ src/bin/e_auth.h \
 src/bin/e_backlight.h \
 src/bin/e_bg.h \
 src/bin/e_bindings.h \
-src/bin/e_box.h \
-src/bin/e_canvas.h \
 src/bin/e_client.h \
 src/bin/e_client.x \
 src/bin/e_color_class.h \
@@ -74,7 +77,6 @@ src/bin/e_dialog.h \
 src/bin/e_dnd.h \
 src/bin/e_dpms.h \
 src/bin/e_desktop_editor.h \
-src/bin/e_entry.h \
 src/bin/e_entry_dialog.h \
 src/bin/e_env.h \
 src/bin/e_error.h \
@@ -91,7 +93,6 @@ src/bin/e_fm_op_registry.h \
 src/bin/e_fm_prop.h \
 src/bin/e_fm_shared_codec.h \
 src/bin/e_fm_shared_device.h \
-src/bin/e_fm_shared_types.h \
 src/bin/e_focus.h \
 src/bin/e_font.h \
 src/bin/e_gadcon.h \
@@ -105,6 +106,8 @@ src/bin/e_ilist.h \
 src/bin/e_import_config_dialog.h \
 src/bin/e_import_dialog.h \
 src/bin/e_includes.h \
+src/bin/e_info_shared_types.h \
+src/bin/e_info_server.h \
 src/bin/e_init.h \
 src/bin/e_int_client_locks.h \
 src/bin/e_int_client_menu.h \
@@ -142,7 +145,7 @@ src/bin/e_place.h \
 src/bin/e_pointer.h \
 src/bin/e_powersave.h \
 src/bin/e_prefix.h \
-src/bin/e_randr.h \
+src/bin/e_randr2.h \
 src/bin/e_remember.h \
 src/bin/e_resist.h \
 src/bin/e_scale.h \
@@ -157,8 +160,8 @@ src/bin/e_slidesel.h \
 src/bin/e_spectrum.h \
 src/bin/e_startup.h \
 src/bin/e_sys.h \
-src/bin/e_table.h \
 src/bin/e_test.h \
+src/bin/e_test_helper.h \
 src/bin/e_theme_about.h \
 src/bin/e_theme.h \
 src/bin/e_thumb.h \
@@ -208,6 +211,12 @@ src/bin/e_uuid_store.h \
 src/bin/e_comp_wl_data.h \
 src/bin/e_comp_wl_input.h \
 src/bin/e_comp_wl.h
+
+if HAVE_WAYLAND_TBM
+ENLIGHTENMENTHEADERS += \
+src/bin/e_comp_wl_tbm.h
+endif
+
 endif
 
 
@@ -215,14 +224,11 @@ enlightenment_src = \
 src/bin/e_about.c \
 src/bin/e_acpi.c \
 src/bin/e_actions.c \
-src/bin/e_alert.c \
 src/bin/e_atoms.c \
 src/bin/e_auth.c \
 src/bin/e_backlight.c \
 src/bin/e_bg.c \
 src/bin/e_bindings.c \
-src/bin/e_box.c \
-src/bin/e_canvas.c \
 src/bin/e_client.c \
 src/bin/e_color.c \
 src/bin/e_color_class.c \
@@ -246,7 +252,6 @@ src/bin/e_dialog.c \
 src/bin/e_dpms.c \
 src/bin/e_desktop_editor.c \
 src/bin/e_dnd.c \
-src/bin/e_entry.c \
 src/bin/e_entry_dialog.c \
 src/bin/e_env.c \
 src/bin/e_error.c \
@@ -273,6 +278,7 @@ src/bin/e_icon.c \
 src/bin/e_ilist.c \
 src/bin/e_import_config_dialog.c \
 src/bin/e_import_dialog.c \
+src/bin/e_info_server.c \
 src/bin/e_init.c \
 src/bin/e_int_client_locks.c \
 src/bin/e_int_client_menu.c \
@@ -325,8 +331,8 @@ src/bin/e_slidesel.c \
 src/bin/e_spectrum.c \
 src/bin/e_startup.c \
 src/bin/e_sys.c \
-src/bin/e_table.c \
 src/bin/e_test.c \
+src/bin/e_test_helper.c \
 src/bin/e_theme_about.c \
 src/bin/e_theme.c \
 src/bin/e_thumb.c \
@@ -373,7 +379,8 @@ $(ENLIGHTENMENTHEADERS)
 if ! HAVE_WAYLAND_ONLY
 enlightenment_src += \
 src/bin/e_comp_x.c \
-src/bin/e_randr.c \
+src/bin/e_alert.c \
+src/bin/e_randr2.c \
 src/bin/e_xsettings.c
 endif
 
@@ -383,15 +390,33 @@ src/bin/e_uuid_store.c \
 src/bin/e_comp_wl_data.c \
 src/bin/e_comp_wl_input.c \
 src/bin/e_comp_wl.c
+
+if HAVE_WAYLAND_TBM
+enlightenment_src += \
+src/bin/e_comp_wl_tbm.c
 endif
 
-src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ -DNEED_X=1
+endif
+
+src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ -DNEED_WL
+if ! HAVE_WAYLAND_ONLY
+src_bin_enlightenment_CPPFLAGS += @ECORE_X_CFLAGS@ -DNEED_X=1
+endif
+if HAVE_WAYLAND_TBM
+src_bin_enlightenment_CPPFLAGS += @WAYLAND_TBM_CFLAGS@ @ECORE_DRM_CFLAGS@
+endif
 src_bin_enlightenment_SOURCES = \
 src/bin/e_main.c \
 $(enlightenment_src)
 
 src_bin_enlightenment_LDFLAGS = -export-dynamic
-src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm @ECORE_X_LIBS@ @SHM_OPEN_LIBS@
+src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ @WAYLAND_EGL_LIBS@ -lm @SHM_OPEN_LIBS@
+if ! HAVE_WAYLAND_ONLY
+src_bin_enlightenment_LDADD += @ECORE_X_LIBS@
+endif
+if HAVE_WAYLAND_TBM
+src_bin_enlightenment_LDADD += @WAYLAND_TBM_LIBS@ @ECORE_DRM_LIBS@
+endif
 
 src_bin_enlightenment_imc_SOURCES = \
 src/bin/e.h \
@@ -457,6 +482,12 @@ src/bin/e_static_grab.c
 src_bin_enlightenment_static_grabber_LDADD = @E_GRABBER_LIBS@
 src_bin_enlightenment_static_grabber_CPPFLAGS = @E_GRABBER_CFLAGS@
 
+src_bin_enlightenment_info_SOURCES = \
+src/bin/e.h \
+src/bin/e_info_client.c
+src_bin_enlightenment_info_LDADD = @E_INFO_LIBS@
+src_bin_enlightenment_info_CPPFLAGS = $(E_CPPFLAGS) @E_INFO_CFLAGS@
+
 include src/bin/e_fm/Makefile.mk
 
 # HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS
@@ -472,7 +503,7 @@ enlightenment-sys-install-data-hook:
 	@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
 endif
 installed_headersdir = $(prefix)/include/enlightenment
-installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
+installed_headers_DATA = $(ENLIGHTENMENTHEADERS) src/bin/e_fm_shared_types.h
 INSTALL_DATA_HOOKS += enlightenment-sys-install-data-hook
 
 PHONIES += e enlightenment install-e install-enlightenment