diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | libdebug/Makefile.am | 14 | ||||
| -rw-r--r-- | libdrmutils/Makefile.am | 17 | ||||
| -rw-r--r-- | libqdutils/Makefile.am | 28 | ||||
| -rw-r--r-- | libqservice/Makefile.am | 11 | ||||
| -rw-r--r-- | sdm/libs/core/Makefile.am | 13 | ||||
| -rw-r--r-- | sdm/libs/utils/Makefile.am | 1 |
8 files changed, 67 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index 8ecc86b4..991d9815 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,4 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libqservice libqdutils sdm/libs/utils sdm/libs/core +SUBDIRS = libqservice libdebug libdrmutils sdm/libs/utils sdm/libs/core libqdutils diff --git a/configure.ac b/configure.ac index 24c41fd9..c9de5213 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,15 @@ fi AC_ARG_WITH(sanitized-headers, AS_HELP_STRING([--with-sanitized-headers=DIR], [Specify the location of the sanitized Linux headers]), - [CPPFLAGS="$CPPFLAGS -idirafter $withval"]) + [CPPFLAGS="$CPPFLAGS -I$withval"]) + +AC_ARG_ENABLE([sdmhaldrm], + AC_HELP_STRING([--enable-sdmhaldrm], + [enable sdmhaldrm, build display-hal-linux with sdmhaldrm]), + [enable_sdmhaldrm="${enableval}"], + enable_sdmhaldrm=no) + +AM_CONDITIONAL([ENABLE_SDMHALDRM], [test "x${enable_sdmhaldrm}" = "xyes"]) # Checks for programs. AC_PROG_CC @@ -50,6 +58,8 @@ AC_CONFIG_FILES([ \ Makefile \ libqservice/Makefile \ libqdutils/Makefile \ + libdebug/Makefile \ + libdrmutils/Makefile \ sdm/libs/utils/Makefile \ sdm/libs/core/Makefile ]) diff --git a/libdebug/Makefile.am b/libdebug/Makefile.am new file mode 100644 index 00000000..41a44458 --- /dev/null +++ b/libdebug/Makefile.am @@ -0,0 +1,14 @@ +h_sources = debug_handler.h + +cpp_sources = debug_handler.cpp + +library_includedir = $(includedir) +library_include_HEADERS = $(h_sources) + +lib_LTLIBRARIES = libdisplaydebug.la +libdisplaydebug_la_CC = @CC@ +libdisplaydebug_la_SOURCES = $(cpp_sources) +libdisplaydebug_la_CFLAGS = $(COMMON_CFLAGS) -DLOG_TAG=\"SDM\" +libdisplaydebug_la_CPPFLAGS = $(AM_CPPFLAGS) +libdisplaydebug_la_LIBADD = -ldl +libdisplaydebug_la_LDFLAGS = -shared -avoid-version diff --git a/libdrmutils/Makefile.am b/libdrmutils/Makefile.am new file mode 100644 index 00000000..a04c8740 --- /dev/null +++ b/libdrmutils/Makefile.am @@ -0,0 +1,17 @@ +HEADER_PATH := ${WORKSPACE}/display/display-hal/libdrmutils + +cpp_sources = drm_lib_loader.cpp \ + drm_master.cpp \ + drm_res_mgr.cpp + +drmutils_h_sources = $(HEADER_PATH)/*.h +drmutils_includedir = $(includedir) +drmutils_include_HEADERS = $(drmutils_h_sources) + +lib_LTLIBRARIES = libdrmutils.la +libdrmutils_la_CC = @CC@ +libdrmutils_la_SOURCES = $(cpp_sources) +libdrmutils_la_CFLAGS = $(COMMON_CFLAGS) -DLOG_TAG=\"DRMUTILS\" +libdrmutils_la_CPPFLAGS = $(AM_CPPFLAGS) +libsdmcore_la_LIBADD = -ldrm +libdrmutils_la_LDFLAGS = -shared -avoid-version diff --git a/libqdutils/Makefile.am b/libqdutils/Makefile.am index 01fbf199..d0241d0a 100644 --- a/libqdutils/Makefile.am +++ b/libqdutils/Makefile.am @@ -1,32 +1,16 @@ -h_sources = qdMetaData.h - -cpp_sources = qdMetaData.cpp - -library_includedir = $(includedir) -library_include_HEADERS = $(h_sources) - -lib_LTLIBRARIES = libqdMetaData.la -libqdMetaData_la_CC = @CC@ -libqdMetaData_la_SOURCES = $(cpp_sources) -libqdMetaData_la_CFLAGS = $(AM_CFLAGS) -DLOG_TAG=\"DisplayMetaData\" -libqdMetaData_la_CPPFLAGS = $(AM_CPPFLAGS) -libqdMetaData_LDADD = -lcutils -llog -libqdMetaData_la_LDFLAGS = -shared -avoid-version - header_sources = display_config.h -c_sources = profiler.cpp \ - qd_utils.cpp \ - display_config.cpp +cpp_sources = qd_utils.cpp \ + display_config.cpp -library_includedir = $(includedir) -library_include_HEADERS = $(header_sources) +qdutils_includedir = $(pkgincludedir)/display +qdutils_include_HEADERS = $(header_sources) -lib_LTLIBRARIES += libqdutils.la +lib_LTLIBRARIES = libqdutils.la libqdutils_la_CC = @CC@ libqdutils_la_SOURCES = $(c_sources) libqdutils_la_CFLAGS = $(COMMON_CFLAGS) -DLOG_TAG=\"qdutils\" libqdutils_la_CPPFLAGS = $(AM_CPPFLAGS) libqdutils_LDADD = -lhardware -lcutils -llog -lbinder libqdutils_la_LIBADD = ../libqservice/libqservice.la -libqdutils_la_LDFLAGS = -shared -avoid-version
\ No newline at end of file +libqdutils_la_LDFLAGS = -shared -avoid-version diff --git a/libqservice/Makefile.am b/libqservice/Makefile.am index 79935b8b..a8c9f6a5 100644 --- a/libqservice/Makefile.am +++ b/libqservice/Makefile.am @@ -1,18 +1,21 @@ h_sources = IQService.h \ - IQClient.h + IQClient.h \ + QService.h \ + QServiceUtils.h \ + IQHDMIClient.h cpp_sources = QService.cpp \ IQService.cpp \ IQClient.cpp \ IQHDMIClient.cpp -library_includedir = $(includedir) -library_include_HEADERS = $(h_sources) +qservice_includedir = $(pkgincludedir)/display +qservice_include_HEADERS = $(h_sources) lib_LTLIBRARIES = libqservice.la libqservice_la_CC = @CC@ libqservice_la_SOURCES = $(cpp_sources) libqservice_la_CFLAGS = $(COMMON_CFLAGS) -DLOG_TAG=\"qdqservice\" libqservice_la_CPPFLAGS = $(AM_CPPFLAGS) -libqservice_LDADD = -lhardware -lcutils -llog -lbinder +libqservice_la_LIBADD = -lhardware -lcutils -llog -lbinder libqservice_la_LDFLAGS = -shared -avoid-version
\ No newline at end of file diff --git a/sdm/libs/core/Makefile.am b/sdm/libs/core/Makefile.am index 2b45d8e3..fc9d2378 100644 --- a/sdm/libs/core/Makefile.am +++ b/sdm/libs/core/Makefile.am @@ -3,17 +3,24 @@ HEADER_PATH := ${WORKSPACE}/display/display-hal/sdm/include c_sources = core_interface.cpp \ core_impl.cpp \ display_base.cpp \ - display_primary.cpp \ - display_hdmi.cpp \ + display_builtin.cpp \ + display_pluggable.cpp \ display_virtual.cpp \ comp_manager.cpp \ strategy.cpp \ resource_default.cpp \ - dump_impl.cpp \ color_manager.cpp \ hw_interface.cpp \ hw_info_interface.cpp \ hw_events_interface.cpp \ + drm/hw_color_manager_drm.cpp \ + drm/hw_device_drm.cpp \ + drm/hw_events_drm.cpp \ + drm/hw_info_drm.cpp \ + drm/hw_peripheral_drm.cpp \ + drm/hw_scale_drm.cpp \ + drm/hw_tv_drm.cpp \ + drm/hw_virtual_drm.cpp \ fb/hw_info.cpp \ fb/hw_device.cpp \ fb/hw_primary.cpp \ diff --git a/sdm/libs/utils/Makefile.am b/sdm/libs/utils/Makefile.am index d8d8dc5a..098775a7 100644 --- a/sdm/libs/utils/Makefile.am +++ b/sdm/libs/utils/Makefile.am @@ -9,4 +9,5 @@ libsdmutils_la_CC = @CC@ libsdmutils_la_SOURCES = $(cpp_sources) libsdmutils_la_CFLAGS = $(COMMON_CFLAGS) -DLOG_TAG=\"SDM\" libsdmutils_la_CPPFLAGS = $(AM_CPPFLAGS) +libsdmutils_la_LIBADD = ../../../libdebug/libdisplaydebug.la libsdmutils_la_LDFLAGS = -shared -avoid-version |