From 9f96225dc93a97467f1e2107e23b79cb10744917 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 5 Feb 2021 14:09:34 +0100 Subject: Add CMakeLists.txt files. --- src/CMakeLists.txt | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 src/CMakeLists.txt (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..ac46096 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,175 @@ +# ayatanamenuitemfactory.h +# idocalendarmenuitem.h +# idoentrymenuitem.h +# idorange.h +# idoscalemenuitem.h +# idoswitchmenuitem.h +# idotimeline.h +# libayatana-ido.h + +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ayatanamenuitemfactory.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idocalendarmenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoentrymenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idorange.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoscalemenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoswitchmenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idotimeline.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libayatana-ido.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido") + +set(HEADERS + idorange.h + idoappointmentmenuitem.h + idousermenuitem.h + idoalarmmenuitem.h + idotimestampmenuitem.h + idoplaybackmenuitem.h + idoremovablemenuitem.h + ayatanamenuitemfactory.h + idobasicmenuitem.h + idoapplicationmenuitem.h + idotimeline.h + idosourcemenuitem.h + idoactionhelper.h + idocalendarmenuitem.h + idolocationmenuitem.h + idoprogressmenuitem.h + libayatana-ido.h + idomediaplayermenuitem.h + idoswitchmenuitem.h + idoscalemenuitem.h + idodetaillabel.h + idoentrymenuitem.h +) + +set(SOURCES + idotimestampmenuitem.c + idodetaillabel.c + libayatana-ido.c + idomenuitemfactory.c + idoactionhelper.c + idoapplicationmenuitem.c + idoplaybackmenuitem.c + idomediaplayermenuitem.c + idocalendarmenuitem.c + ayatanamenuitemfactory.c + idoprogressmenuitem.c + idolocationmenuitem.c + idoscalemenuitem.c + idoentrymenuitem.c + idoalarmmenuitem.c + idorange.c + idoappointmentmenuitem.c + idoswitchmenuitem.c + idoremovablemenuitem.c + idobasicmenuitem.c + idousermenuitem.c + idosourcemenuitem.c + idotimeline.c + ${CMAKE_CURRENT_BINARY_DIR}/idotypebuiltins.c +) + +# idotypebuiltins.h + +find_program(GLIB_MKENUMS glib-mkenums) + +add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/idotypebuiltins.h" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND + ${GLIB_MKENUMS} + --template idotypebuiltins.h.template ${HEADERS} + --output="${CMAKE_CURRENT_BINARY_DIR}/idotypebuiltins.h" +) + +# idotypebuiltins.c + +add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/idotypebuiltins.c" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/idotypebuiltins.h" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND + ${GLIB_MKENUMS} + --template idotypebuiltins.c.template ${HEADERS} + --output="${CMAKE_CURRENT_BINARY_DIR}/idotypebuiltins.c" +) + +# ayatana-ido3-0.4.so + +set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) +add_library("ayatana-ido3-0.4" SHARED ${SOURCES}) +set_target_properties("ayatana-ido3-0.4" PROPERTIES VERSION 0.0.0 SOVERSION 0) +target_include_directories("ayatana-ido3-0.4" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) +target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_compile_definitions("ayatana-ido3-0.4" PUBLIC G_LOG_DOMAIN="IDO") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0.0.0" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + +# ayatana-ido3-0.4.gir + +set(HEADERS + idocalendarmenuitem.h + idoentrymenuitem.h + idorange.h + idoscalemenuitem.h + idoswitchmenuitem.h + idotimeline.h +) + +find_package(GObjectIntrospection REQUIRED QUIET) + +add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" + DEPENDS "ayatana-ido3-0.4" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND + ${INTROSPECTION_SCANNER} + ${SOURCES} ${HEADERS} + --symbol-prefix=ido + --identifier-prefix=Ido + --namespace=AyatanaIdo3 + --nsversion=0.4 + --quiet + --pkg=gtk+-3.0 + --warn-all + --include=Gtk-3.0 + --library="ayatana-ido3-0.4" + --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" +) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/gir-1.0") + +# ayatana-ido3-0.4.typelib + +add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND + ${INTROSPECTION_COMPILER} + --includedir=${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir + -o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" +) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/girepository-1.0") + +# ayatana-ido3-0.4.vapi + +find_package(Vala REQUIRED QUIET) + +add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND + ${VAPI_GEN} + --library=AyatanaIdo3-0.4 + --pkg gtk+-3.0 + AyatanaIdo3-0.4.gir +) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/vala/vapi") + +add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi") -- cgit v1.2.3 From 94e20a898ecffa0a5766e6e2d7daabbda312a4fc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 20 Apr 2021 15:49:36 +0200 Subject: src/CMakeLists.txt: Actively set --library-path for g-ir-scanner. --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac46096..36132fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -135,6 +135,7 @@ add_custom_command( --warn-all --include=Gtk-3.0 --library="ayatana-ido3-0.4" + --library-path=${CMAKE_CURRENT_BINARY_DIR} --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" ) -- cgit v1.2.3 From 715feb6c46d4f25baad053eaf1c43129c65328cf Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 5 Feb 2021 14:12:07 +0100 Subject: Remove automake-related files --- src/Makefile.am | 196 -------------------------------------------------------- src/ido.list | 1 - 2 files changed, 197 deletions(-) delete mode 100644 src/Makefile.am delete mode 100644 src/ido.list (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 268e2fd..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,196 +0,0 @@ -NULL = - -CLEANFILES = - -lib_LTLIBRARIES = libayatana-ido3-0.4.la - -ido_built_public_sources = \ - idotypebuiltins.h - -stamp_files = \ - idotypebuiltins.h \ - idotypebuiltins.c \ - $(NULL) - -sources_h = \ - ayatanamenuitemfactory.h \ - idoalarmmenuitem.h \ - idocalendarmenuitem.h \ - idoentrymenuitem.h \ - idorange.h \ - idoscalemenuitem.h \ - idoswitchmenuitem.h \ - idousermenuitem.h \ - idoappointmentmenuitem.h \ - idobasicmenuitem.h \ - idoremovablemenuitem.h \ - idoprogressmenuitem.h \ - idotimestampmenuitem.h \ - idolocationmenuitem.h \ - idotimeline.h \ - libayatana-ido.h \ - idoactionhelper.h \ - idomediaplayermenuitem.h \ - idoplaybackmenuitem.h \ - idoapplicationmenuitem.h \ - idodetaillabel.h \ - idosourcemenuitem.h \ - $(NULL) - -sources_c = \ - ayatanamenuitemfactory.c \ - libayatana-ido.c \ - idotypebuiltins.c \ - idocalendarmenuitem.c \ - idoalarmmenuitem.c \ - idoentrymenuitem.c \ - idorange.c \ - idoscalemenuitem.c \ - idoswitchmenuitem.c \ - idotimeline.c \ - idomenuitemfactory.c \ - idoactionhelper.c \ - idousermenuitem.c \ - idomediaplayermenuitem.c \ - idoplaybackmenuitem.c \ - idoappointmentmenuitem.c \ - idobasicmenuitem.c \ - idoremovablemenuitem.c \ - idoprogressmenuitem.c \ - idotimestampmenuitem.c \ - idolocationmenuitem.c \ - idoapplicationmenuitem.c \ - idodetaillabel.c \ - idosourcemenuitem.c \ - $(NULL) - -EXTRA_DIST = \ - ido.list \ - idotypebuiltins.h.template \ - idotypebuiltins.c.template \ - $(NULL) - -idotypebuiltins.h: stamp-idotypebuiltins.h - -stamp-idotypebuiltins.h: $(sources_h) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.h.template \ - $(sources_h) ) >> xgen-gtbh \ - && (cmp -s xgen-gtbh idotypebuiltins.h || cp xgen-gtbh idotypebuiltins.h ) \ - && rm -f xgen-gtbh && echo timestamp > $(@F) \ - $(NULL) - -idotypebuiltins.c: stamp-idotypebuiltins.h - ( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.c.template \ - $(sources_h) ) > xgen-gtbc \ - && cp xgen-gtbc idotypebuiltins.c && rm -f xgen-gtbc - -AM_CPPFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"IDO\" \ - -DPREFIX=\"$(prefix)"\" \ - -DLIBDIR=\"$(libdir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - $(GCC_FLAGS) \ - $(GTK_CFLAGS) \ - $(MAINTAINER_CFLAGS) \ - -Wall -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations \ - $(NULL) - -AM_CFLAGS = \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -libayatana_ido_0_4_la_SOURCES = \ - $(sources_h) \ - $(sources_c) \ - $(NULL) - -libayatana_ido3_0_4_la_SOURCES = $(libayatana_ido_0_4_la_SOURCES) - -libayatana_idoincludedir=$(includedir)/libayatana-ido3-0.4/libayatana-ido - -libayatana_idoinclude_HEADERS = \ - ayatanamenuitemfactory.h \ - idocalendarmenuitem.h \ - idoentrymenuitem.h \ - idorange.h \ - idoscalemenuitem.h \ - idoswitchmenuitem.h \ - idotimeline.h \ - libayatana-ido.h \ - $(NULL) - -libayatana_ido_0_4_la_LIBADD = $(GTK_LIBS) $(LIBM) -libayatana_ido_0_4_la_LDFLAGS = \ - $(GTK_LT_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - -no-undefined \ - -export-symbols-regex "^[^_].*" \ - $(NULL) - -libayatana_ido3_0_4_la_LIBADD = $(libayatana_ido_0_4_la_LIBADD) -libayatana_ido3_0_4_la_LDFLAGS = $(libayatana_ido_0_4_la_LDFLAGS) - -DISTCLEANFILES = \ - Makefile.in \ - stamp-idotypebuiltins.h \ - idotypebuiltins.h \ - idotypebuiltins.c \ - $(NULL) - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = \ - --symbol-prefix=ido \ - --warn-all \ - --identifier-prefix=Ido \ - $(NULL) - -if HAVE_INTROSPECTION - -AyatanaIdo3-0.4.gir: libayatana-ido3-0.4.la -AyatanaIdo3_0_4_gir_INCLUDES = Gtk-3.0 -AyatanaIdo3_0_4_gir_CFLAGS = -AyatanaIdo3_0_4_gir_LIBS = libayatana-ido3-0.4.la -AyatanaIdo3_0_4_gir_FILES = \ - idocalendarmenuitem.h \ - idoentrymenuitem.h \ - idorange.h \ - idoscalemenuitem.h \ - idoswitchmenuitem.h \ - idotimeline.h \ - $(sources_c) \ - $(NULL) - -AyatanaIdo3_0_4_gir_NAMESPACE = AyatanaIdo3 -AyatanaIdo3_0_4_gir_VERSION = 0.4 -AyatanaIdo3_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) - -INTROSPECTION_GIRS += AyatanaIdo3-0.4.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) - -endif - -if HAVE_INTROSPECTION - -vapidir = $(datadir)/vala/vapi -vapi_DATA = AyatanaIdo3-0.4.vapi - -AyatanaIdo3-0.4.vapi: AyatanaIdo3-0.4.gir - $(VALA_API_GEN) --library=AyatanaIdo3-0.4 \ - --pkg gtk+-3.0 \ - $< - -CLEANFILES += $(vapi_DATA) - -endif diff --git a/src/ido.list b/src/ido.list deleted file mode 100644 index cd4f64d..0000000 --- a/src/ido.list +++ /dev/null @@ -1 +0,0 @@ -VOID:POINTER,UINT -- cgit v1.2.3 From 2ebe5c8e1f240bdd4b27401b4e52213425c7686d Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Feb 2021 07:48:32 +0100 Subject: Drop local config.h includes. Fixes AyatanaIndicators/ayatana-ido#25 --- src/idoalarmmenuitem.c | 4 ---- src/idoappointmentmenuitem.c | 4 ---- src/idobasicmenuitem.c | 4 ---- src/idocalendarmenuitem.c | 1 - src/idoentrymenuitem.c | 1 - src/idolocationmenuitem.c | 4 ---- src/idomediaplayermenuitem.c | 2 -- src/idoplaybackmenuitem.c | 2 -- src/idorange.c | 1 - src/idoremovablemenuitem.c | 4 ---- src/idoscalemenuitem.c | 3 --- src/idoswitchmenuitem.c | 2 -- src/idotimestampmenuitem.c | 4 ---- src/idousermenuitem.c | 4 ---- 14 files changed, 40 deletions(-) (limited to 'src') diff --git a/src/idoalarmmenuitem.c b/src/idoalarmmenuitem.c index 25c3f33..7b70e6d 100644 --- a/src/idoalarmmenuitem.c +++ b/src/idoalarmmenuitem.c @@ -18,10 +18,6 @@ * with this program. If not, see . */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - #include #include "idoactionhelper.h" diff --git a/src/idoappointmentmenuitem.c b/src/idoappointmentmenuitem.c index 9dc26a1..5659644 100644 --- a/src/idoappointmentmenuitem.c +++ b/src/idoappointmentmenuitem.c @@ -18,10 +18,6 @@ * with this program. If not, see . */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - #include #include "idoactionhelper.h" diff --git a/src/idobasicmenuitem.c b/src/idobasicmenuitem.c index 8e8c41e..080151c 100644 --- a/src/idobasicmenuitem.c +++ b/src/idobasicmenuitem.c @@ -17,10 +17,6 @@ * with this program. If not, see . */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - #include #include "idoactionhelper.h" diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c index 938dc14..1797648 100644 --- a/src/idocalendarmenuitem.c +++ b/src/idocalendarmenuitem.c @@ -26,7 +26,6 @@ #include #include "idoactionhelper.h" #include "idocalendarmenuitem.h" -#include "config.h" static void ido_calendar_menu_item_finalize (GObject *item); static void ido_calendar_menu_item_select (GtkMenuItem *item); diff --git a/src/idoentrymenuitem.c b/src/idoentrymenuitem.c index d2948df..3fb2186 100644 --- a/src/idoentrymenuitem.c +++ b/src/idoentrymenuitem.c @@ -25,7 +25,6 @@ #include #include "idoentrymenuitem.h" -#include "config.h" static void ido_entry_menu_item_finalize (GObject *item); static void ido_entry_menu_item_select (GtkMenuItem *item); diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c index 983126b..8b16807 100644 --- a/src/idolocationmenuitem.c +++ b/src/idolocationmenuitem.c @@ -17,10 +17,6 @@ * with this program. If not, see . */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - #include /* strstr() */ #include diff --git a/src/idomediaplayermenuitem.c b/src/idomediaplayermenuitem.c index ef1b2aa..801d57b 100644 --- a/src/idomediaplayermenuitem.c +++ b/src/idomediaplayermenuitem.c @@ -19,8 +19,6 @@ * Lars Uebernickel */ -#include "config.h" - #include "idomediaplayermenuitem.h" #include "idoactionhelper.h" diff --git a/src/idoplaybackmenuitem.c b/src/idoplaybackmenuitem.c index 4c90442..7f19718 100644 --- a/src/idoplaybackmenuitem.c +++ b/src/idoplaybackmenuitem.c @@ -20,8 +20,6 @@ * Lars Uebernickel */ -#include "config.h" - #include "idoplaybackmenuitem.h" #include diff --git a/src/idorange.c b/src/idorange.c index 634b223..0e0d472 100644 --- a/src/idorange.c +++ b/src/idorange.c @@ -25,7 +25,6 @@ #include "idorange.h" #include "idotypebuiltins.h" -#include "config.h" typedef struct { IdoRangeStyle style; diff --git a/src/idoremovablemenuitem.c b/src/idoremovablemenuitem.c index 685e136..88d20ad 100644 --- a/src/idoremovablemenuitem.c +++ b/src/idoremovablemenuitem.c @@ -17,10 +17,6 @@ * with this program. If not, see . */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - #include #include "idoactionhelper.h" diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c index 17bf44b..7baac17 100644 --- a/src/idoscalemenuitem.c +++ b/src/idoscalemenuitem.c @@ -23,9 +23,6 @@ * Cody Russell */ -#include "config.h" - - #include #include "idorange.h" #include "idoscalemenuitem.h" diff --git a/src/idoswitchmenuitem.c b/src/idoswitchmenuitem.c index 5a77b88..9bc9ef9 100644 --- a/src/idoswitchmenuitem.c +++ b/src/idoswitchmenuitem.c @@ -18,8 +18,6 @@ * Author: Charles Kerr */ -#include "config.h" - #include "idoswitchmenuitem.h" #include "idoactionhelper.h" diff --git a/src/idotimestampmenuitem.c b/src/idotimestampmenuitem.c index 0c9c086..ec38b73 100644 --- a/src/idotimestampmenuitem.c +++ b/src/idotimestampmenuitem.c @@ -18,10 +18,6 @@ * with this program. If not, see . */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - #include /* strstr() */ #include diff --git a/src/idousermenuitem.c b/src/idousermenuitem.c index c8ddc5e..96bbeb4 100644 --- a/src/idousermenuitem.c +++ b/src/idousermenuitem.c @@ -19,10 +19,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - #include #include "idousermenuitem.h" -- cgit v1.2.3 From d62ba3a055e1fa6cacfa34e8733784a68324ce78 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Feb 2021 07:45:01 +0100 Subject: src/idotimestampmenuitem.c: Whitespace fixes in copyright header. --- src/idotimestampmenuitem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/idotimestampmenuitem.c b/src/idotimestampmenuitem.c index ec38b73..3cafbfc 100644 --- a/src/idotimestampmenuitem.c +++ b/src/idotimestampmenuitem.c @@ -5,16 +5,16 @@ * Charles Kerr * Ted Gould * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published * by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along + * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ -- cgit v1.2.3