From 5e3b73e620de7d3cb1aa4285594e0a6d9a78dee6 Mon Sep 17 00:00:00 2001 From: zhuyaliang <15132211195@163.com> Date: Wed, 4 Oct 2023 16:12:05 +0800 Subject: Rename libmate-desktop/{mate-desktop.h => mate-desktop.h.in} add MATE_DESKTOP_VERSION marco --- configure.ac | 1 + libmate-desktop/mate-desktop.h | 45 ------------------------------------- libmate-desktop/mate-desktop.h.in | 47 +++++++++++++++++++++++++++++++++++++++ libmate-desktop/meson.build | 15 ++++++++++--- 4 files changed, 60 insertions(+), 48 deletions(-) delete mode 100644 libmate-desktop/mate-desktop.h create mode 100644 libmate-desktop/mate-desktop.h.in diff --git a/configure.ac b/configure.ac index 12fd12b..7f6616a 100644 --- a/configure.ac +++ b/configure.ac @@ -246,6 +246,7 @@ mate-about/Makefile mate-about/mate-about.h mate-about/mate-version.xml libmate-desktop/Makefile +libmate-desktop/mate-desktop.h libmate-desktop/mate-desktop-2.0.pc libmate-desktop/mate-desktop-2.0-uninstalled.pc docs/Makefile diff --git a/libmate-desktop/mate-desktop.h b/libmate-desktop/mate-desktop.h deleted file mode 100644 index 54a8e4c..0000000 --- a/libmate-desktop/mate-desktop.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * mate-desktop.h: general functions for libmate-desktop - * - * Copyright (C) 2013 Stefano Karapetsas - * Copyright (C) 2013-2021 MATE Developers - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301, USA. - * - * Authors: - * Stefano Karapetsas - */ - -#ifndef __MATE_DESKTOP_H__ -#define __MATE_DESKTOP_H__ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -G_BEGIN_DECLS - -#define MATE_DESKTOP_CHECK_VERSION(major,minor,micro) \ - (MATE_MAJOR > (major) || \ - (MATE_MAJOR == (major) && MATE_MINOR > (minor)) || \ - (MATE_MAJOR == (major) && MATE_MINOR == (minor) && \ - MATE_MICRO >= (micro))) - -G_END_DECLS - -#endif /* __MATE_DESKTOP_H__ */ diff --git a/libmate-desktop/mate-desktop.h.in b/libmate-desktop/mate-desktop.h.in new file mode 100644 index 0000000..3e2bc6c --- /dev/null +++ b/libmate-desktop/mate-desktop.h.in @@ -0,0 +1,47 @@ +/* + * mate-desktop.h: general functions for libmate-desktop + * + * Copyright (C) 2013 Stefano Karapetsas + * Copyright (C) 2013-2021 MATE Developers + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301, USA. + * + * Authors: + * Stefano Karapetsas + */ + +#ifndef __MATE_DESKTOP_H__ +#define __MATE_DESKTOP_H__ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +G_BEGIN_DECLS + +#define MATE_DESKTOP_CHECK_VERSION(major,minor,micro) \ + (MATE_MAJOR > (major) || \ + (MATE_MAJOR == (major) && MATE_MINOR > (minor)) || \ + (MATE_MAJOR == (major) && MATE_MINOR == (minor) && \ + MATE_MICRO >= (micro))) + +#define MATE_DESKTOP_VERSION "@PACKAGE_VERSION@" + +G_END_DECLS + +#endif /* __MATE_DESKTOP_H__ */ diff --git a/libmate-desktop/meson.build b/libmate-desktop/meson.build index b11f242..e0e94ae 100644 --- a/libmate-desktop/meson.build +++ b/libmate-desktop/meson.build @@ -1,7 +1,16 @@ libmdt_inc = include_directories('.') -headers = files( - 'mate-desktop.h', +version_conf = configuration_data() +version_conf.set('PACKAGE_VERSION', matedt_version) + +mate_desktop_header_file = configure_file( + input: 'mate-desktop.h.in', + output: 'mate-desktop.h', + configuration: version_conf, +) + +headers = [ + mate_desktop_header_file, 'mate-desktop-utils.h', 'mate-desktop-item.h', 'mate-dconf.h', @@ -18,7 +27,7 @@ headers = files( 'mate-colorsel.h', 'mate-hsv.h', 'mate-colorseldialog.h', -) +] install_headers( headers, -- cgit v1.2.1