diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-05-12 13:07:56 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-05-12 13:07:56 +0200 |
| commit | 025c376068f63d8c2aa5899a3c0b1b827370da28 (patch) | |
| tree | 99d5ce170fa25fd17f5d4569e8b3b3656c9fe44b /tools | |
| parent | aa6723b9cc3dcac5b9bdd87944a8c99b74f16ba2 (diff) | |
| parent | c277aa68455b232c37a4c52b39e948a6ab0b0e11 (diff) | |
| download | libayatana-indicator-025c376068f63d8c2aa5899a3c0b1b827370da28.tar.gz libayatana-indicator-025c376068f63d8c2aa5899a3c0b1b827370da28.tar.bz2 libayatana-indicator-025c376068f63d8c2aa5899a3c0b1b827370da28.zip | |
Merge branch 'tari01-pr/move-to-cmake'
Attributes GH PR #38: https://github.com/AyatanaIndicators/libayatana-indicator/pull/38
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/indicator-loader.c | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt new file mode 100644 index 0000000..4120f31 --- /dev/null +++ b/tools/CMakeLists.txt @@ -0,0 +1,8 @@ +# 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") diff --git a/tools/Makefile.am b/tools/Makefile.am index e871921..7d25b5c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,7 +23,7 @@ ayatana_indicator_loader_CFLAGS = \ ayatana_indicator_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ $(LIBINDICATOR_IDO_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.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. diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 5b236db..159b17b 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -3,11 +3,13 @@ * and during development of them. * * Copyright 2009 Canonical Ltd. + * Copyright 2021 AyatanaIndicators * * Authors: * Ted Gould <ted@canonical.com> * Lars Uebernickel <lars.uebernickel@canonical.com> * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +19,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License version 3.0 for more details. - * + * * You should have received a copy of the GNU General Public * License along with this library. If not, see * <http://www.gnu.org/licenses/>. @@ -25,9 +27,9 @@ #include <gtk/gtk.h> #include <libayatana-ido/libayatana-ido.h> -#include <libayatana-indicator/indicator-object.h> +#include "indicator-object.h" #if GTK_CHECK_VERSION (3,0,0) - #include <libayatana-indicator/indicator-ng.h> + #include "indicator-ng.h" #endif static GHashTable * entry_to_menu_item = NULL; @@ -159,7 +161,7 @@ entry_added (IndicatorObject * io, gtk_widget_show (menu_item); } -static void +static void entry_removed (__attribute__((unused)) IndicatorObject * io, IndicatorObjectEntry * entry, __attribute__((unused)) gpointer user_data) |