diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-02-26 01:10:23 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-26 11:44:44 +0100 |
| commit | 70839ce7b79e5fc7e179708883ff78f221f7d839 (patch) | |
| tree | 7cf6b7457f2b5c9231fbb925ea4cf27254c406ff | |
| parent | 8dd0afb14153929cc1af6c587b0e942d0d09086c (diff) | |
| download | tdepim-70839ce7b79e5fc7e179708883ff78f221f7d839.tar.gz tdepim-70839ce7b79e5fc7e179708883ff78f221f7d839.zip | |
Delete the no longer needed tdepimmacros.h.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 577d952253c7f26919875e7dcf7bae2280b3d283)
| -rw-r--r-- | libtdepim/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libtdepim/Makefile.am | 2 | ||||
| -rw-r--r-- | libtdepim/tdepimmacros.h | 35 |
3 files changed, 2 insertions, 39 deletions
diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt index 15394c1e5..f96611f35 100644 --- a/libtdepim/CMakeLists.txt +++ b/libtdepim/CMakeLists.txt @@ -38,9 +38,7 @@ link_directories( ##### headers ################################### -install( FILES - tdepimmacros.h kpimprefs.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( FILES kpimprefs.h DESTINATION ${INCLUDE_INSTALL_DIR} ) ##### other data ################################ diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am index cbee9ed68..25beabe5b 100644 --- a/libtdepim/Makefile.am +++ b/libtdepim/Makefile.am @@ -48,7 +48,7 @@ libtdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_TDEPARTS) $(LIB_TDEIMPROXY) $(LIB_POLL) $(LIB_QUI) # $top_builddir)/libtdepim/resources/libkpimresources.la -include_HEADERS = tdepimmacros.h kpimprefs.h +include_HEADERS = kpimprefs.h AM_CXXFLAGS = -DQT_PLUGIN kde_widget_LTLIBRARIES = tdepimwidgets.la diff --git a/libtdepim/tdepimmacros.h b/libtdepim/tdepimmacros.h deleted file mode 100644 index 5336af1b8..000000000 --- a/libtdepim/tdepimmacros.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - This file is part of libtdepim. - - Copyright (c) 2002-2003 KDE Team - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -// WARNING Don't add include guards here, they were removed on purpose - -#include <tdeversion.h> -#include <kdemacros.h> - -#if KDE_IS_VERSION( 3,3,90 ) -/* life is great */ -#else -/* workaround typo that breaks compilation with newer gcc */ -#undef KDE_EXPORT -#define KDE_EXPORT -#undef KDE_NO_EXPORT -#define KDE_NO_EXPORT -#endif |