X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fadaptor%2FMakefile.am;h=927c5f08d2053003641b367f19b224d8aae3cd56;hb=c8250e2ee705059fed16528ca49642da093d6648;hp=f904d83fc14da637860fdd6c9aae7d186c690e3b;hpb=78f21e4251d4ba8be4845906b74a6b700b00b28f;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index f904d83..927c5f0 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -83,16 +83,12 @@ adaptor_mobile_dir = ../../../adaptors/mobile include ../../../adaptors/mobile/file.list # WEARABLE -if WEARABLE_PROFILE adaptor_wearable_dir = ../../../adaptors/wearable include ../../../adaptors/wearable/file.list -endif # TV -if TV_PROFILE adaptor_tv_dir = ../../../adaptors/tv include ../../../adaptors/tv/file.list -endif # Public API adaptor_public_api_dir = ../../../adaptors/public-api @@ -383,7 +379,7 @@ libdali_adaptor_la_CXXFLAGS = \ -DTIZEN_PLATFORM_CONFIG_SUPPORTED=${tizenPlatformConfigSupported} \ -DNON_POWER_OF_TWO_TEXTURES \ -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ - -Werror -Wall -lgcc \ + -Werror -Wall -lgcc -Wold-style-cast\ $(libdali_adaptor_la_includes) \ $(DALI_ADAPTOR_CFLAGS) \ $(DALICORE_CFLAGS) \ @@ -408,7 +404,10 @@ if !COMMON_PROFILE libdali_adaptor_la_CXXFLAGS += -DWAYLAND_EXTENSIONS_SUPPORTED endif -libdali_adaptor_la_CFLAGS = $(libdali_adaptor_la_CXXFLAGS) +libdali_adaptor_la_CFLAGS = \ + -Werror -Wall \ + -DDALI_COMPILATION -DDALI_ADAPTOR_COMPILATION \ + $(DALI_ADAPTOR_CFLAGS) libdali_adaptor_la_LIBADD = \ $(DALICORE_LIBS) \ @@ -494,10 +493,11 @@ endif if WEARABLE_PROFILE libdali_adaptor_la_CXXFLAGS += \ $(HAPTIC_CFLAGS) \ - $(EFL_ASSIST_CFLAGS) \ - $(SCREENCONNECTORPROVIDER_CFLAGS) + $(EFL_ASSIST_CFLAGS) + $(APPCORE_WATCH_CFLAGS) + libdali_adaptor_la_LIBADD += \ - $(SCREENCONNECTORPROVIDER_LIBS) + $(APPCORE_WATCH_LIBS) endif if TV_PROFILE @@ -570,12 +570,10 @@ endif # NOT UBUNTU_PROFILE tizenadaptordaliheaderdir = $(devincludepath)/dali tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file) -if WEARABLE_PROFILE tizenadaptorpublicapi_HEADERS += $(adaptor_dali_wearable_header_file) tizenwatchpublicapidir = $(tizenadaptorpublicapidir)/watch tizenwatchpublicapi_HEADERS = $(public_dali_watch_header_files) -endif install-data-local: $(MKDIR_P) ${DESTDIR}/${daliUserFontCacheDir} ${DESTDIR}/${daliShaderbinCacheDir}