diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/CMakeLists.txt | 19 | ||||
-rw-r--r-- | tools/Makefile.am | 43 |
2 files changed, 12 insertions, 50 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 4120f31..3be325d 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,8 +1,13 @@ -# ayatana-indicator-loader3 +if (FLAVOUR_GTK3) + # ayatana-indicator-loader3 -set_source_files_properties(indicator-loader.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) -add_executable("ayatana-indicator-loader3" indicator-loader.c) -target_include_directories("ayatana-indicator-loader3" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) -target_include_directories("ayatana-indicator-loader3" PUBLIC "${CMAKE_SOURCE_DIR}/src") -target_link_libraries("ayatana-indicator-loader3" ${PROJECT_DEPS_LIBRARIES} "-L${CMAKE_BINARY_DIR}/src" -layatana-indicator3) -add_dependencies("ayatana-indicator-loader3" "ayatana-indicator3") + set_source_files_properties(indicator-loader.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) + add_executable("ayatana-indicator-loader3" indicator-loader.c) + target_include_directories("ayatana-indicator-loader3" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) + target_include_directories("ayatana-indicator-loader3" PUBLIC "${CMAKE_SOURCE_DIR}/src") + target_link_libraries("ayatana-indicator-loader3" ${PROJECT_DEPS_LIBRARIES} "-L${CMAKE_BINARY_DIR}/src" -layatana-indicator3) + add_dependencies("ayatana-indicator-loader3" "ayatana-indicator3") + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-loader3" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME}") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/80indicator-debugging" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}") +endif() diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 7d25b5c..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -if USE_IDO -if USE_GTK3 -INDICATOR_LIB = -layatana-indicator3 -libexec_PROGRAMS = ayatana-indicator-loader3 -VER=3 -endif -endif - - -############################# -# Indicator Loader -############################# - -ayatana_indicator_loader_SOURCES = \ - indicator-loader.c - -ayatana_indicator_loader_CFLAGS = \ - -Wall \ - $(LIBINDICATOR_CFLAGS) \ - $(LIBINDICATOR_IDO_CFLAGS) -I$(top_srcdir) \ - -DBUILD_DIR="\"$(builddir)\"" - -ayatana_indicator_loader_LDADD = \ - $(LIBINDICATOR_LIBS) \ - $(LIBINDICATOR_IDO_LIBS) \ - -L$(top_builddir)/src/.libs \ - $(INDICATOR_LIB) - -# We duplicate these here because Automake won't let us use $(VER) on the left hand side. -# Since we carefully use $(VER) in the right hand side above, we can assign the same values. -# Only one version of the library is every compiled at the same time, so it is safe to reuse -# the right hand sides like this. -ayatana_indicator_loader3_SOURCES = $(ayatana_indicator_loader_SOURCES) -ayatana_indicator_loader3_CFLAGS = $(ayatana_indicator_loader_CFLAGS) -ayatana_indicator_loader3_LDADD = $(ayatana_indicator_loader_LDADD) - -xsessiondir = $(pkgdatadir) - -xsession_DATA = 80indicator-debugging - -EXTRA_DIST = $(xsession_DATA) - -DISTCLEANFILES = Makefile.in |