projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[4.0] Create Widget Application"
[platform/core/uifw/dali-adaptor.git]
/
build
/
tizen
/
adaptor
/
Makefile.am
diff --git
a/build/tizen/adaptor/Makefile.am
b/build/tizen/adaptor/Makefile.am
index
6f71da5
..
39e0145
100644
(file)
--- a/
build/tizen/adaptor/Makefile.am
+++ b/
build/tizen/adaptor/Makefile.am
@@
-90,9
+90,6
@@
include ../../../adaptors/public-api/file.list
adaptor_devel_api_dir = ../../../adaptors/devel-api
include ../../../adaptors/devel-api/file.list
adaptor_devel_api_dir = ../../../adaptors/devel-api
include ../../../adaptors/devel-api/file.list
-# Widget API
-adaptor_widget_api_dir = ../../../adaptors/widget
-include ../../../adaptors/widget/file.list
# Static libraries
static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
# Static libraries
static_libraries_libunibreak_src_dir = ../../../text/dali/internal/libunibreak
@@
-260,13
+257,6
@@
endif # WAYLAND
endif # IVI_PROFILE
endif # IVI_PROFILE
-if USE_APPFW
-if USE_APPFW_EFL_BASE
-else # over Tizen 3.0
-adaptor_internal_src_files += $(adaptor_internal_widget_src_files)
-endif
-endif
-
main_loop_integration_src_files = $(adaptor_common_internal_ecore_src_files)
input_event_handler_src_files = $(adaptor_ecore_x_event_handler_internal_src_files)
main_loop_integration_src_files = $(adaptor_common_internal_ecore_src_files)
input_event_handler_src_files = $(adaptor_ecore_x_event_handler_internal_src_files)
@@
-300,14
+290,6
@@
LIBDALI_ADAPTOR_LA_SOURCES += \
$(base_adaptor_networking_src_files)
endif
$(base_adaptor_networking_src_files)
endif
-if USE_APPFW
-if USE_APPFW_EFL_BASE
-else # over Tizen 3.0
-LIBDALI_ADAPTOR_LA_SOURCES += \
- $(adaptor_widget_src_files)
-endif
-endif
-
libdali_adaptor_la_DEPENDENCIES =
# List include directories with more platform-specific (tizen) before portable root:
libdali_adaptor_la_DEPENDENCIES =
# List include directories with more platform-specific (tizen) before portable root:
@@
-358,15
+340,6
@@
LIBDALI_ADAPTOR_LA_includes += \
-I../../../adaptors/tizen
endif
-I../../../adaptors/tizen
endif
-if USE_APPFW
-if USE_APPFW_EFL_BASE
-else # over Tizen 3.0
-LIBDALI_ADAPTOR_LA_includes += \
- -I../../../adaptors/widget \
- -I../../../adaptors/widget/internal
-endif
-endif
-
daliDefaultThemeDir = ${dataReadWriteDir}/theme/
daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
daliDefaultThemeDir = ${dataReadWriteDir}/theme/
daliShaderbinCacheDir = ${dataReadOnlyDir}/core/shaderbin/
@@
-465,21
+438,13
@@
LIBDALI_ADAPTOR_LA_CXXFLAGS += $(ELEMENTARY_CFLAGS)
LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS)
else
LIBDALI_ADAPTOR_LA_LIBADD += $(ELEMENTARY_LIBS)
else
-LIBDALI_ADAPTOR_LA_CXXFLAGS += $(BUNDLE_CFLAGS) \
- $(CAPI_AUL_CFLAGS) \
- $(CAPI_APPFW_COMMON_CFLAGS) \
- $(CAPI_APPFW_WIDGET_APPLICATION_CFLAGS) \
+LIBDALI_ADAPTOR_LA_CXXFLAGS += $(CAPI_APPFW_COMMON_CFLAGS) \
$(CAPI_APPFW_CONTROL_CFLAGS) \
$(CAPI_APPFW_CONTROL_CFLAGS) \
- $(CAPI_SCREEN_CONNECTOR_PROVIDER_CFLAGS) \
$(ECORE_IMF_CFLAGS) \
$(FRIBIDI_CFLAGS)
$(ECORE_IMF_CFLAGS) \
$(FRIBIDI_CFLAGS)
-LIBDALI_ADAPTOR_LA_LIBADD += $(BUNDLE_LIBS) \
- $(CAPI_AUL_LIBS) \
- $(CAPI_APPFW_COMMON_LIBS) \
- $(CAPI_APPFW_WIDGET_APPLICATION_LIBS) \
+LIBDALI_ADAPTOR_LA_LIBADD += $(CAPI_APPFW_COMMON_LIBS) \
$(CAPI_APPFW_CONTROL_LIBS) \
$(CAPI_APPFW_CONTROL_LIBS) \
- $(CAPI_SCREEN_CONNECTOR_PROVIDER_LIBS) \
$(ECORE_IMF_LIBS) \
$(FRIBIDI_LIBS)
endif
$(ECORE_IMF_LIBS) \
$(FRIBIDI_LIBS)
endif
@@
-604,14
+569,6
@@
tizenadaptorpublicapi_HEADERS += $(adaptor_dali_wearable_header_file)
tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch
tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files)
tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch
tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files)
-if USE_APPFW
-if USE_APPFW_EFL_BASE
-else # over Tizen 3.0
-tizenwidgetdevelapidir = $(tizenadaptordevelapidir)/widget
-tizenwidgetdevelapi_HEADERS = $(adaptor_widget_header_files)
-endif
-endif
-
install-data-local:
$(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir}
install-data-local:
$(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir}