gnome/gedit
gnome/gedit
1
0
Fork 0
mirror of https://github.com/GNOME/gedit synced 2024-06-30 23:15:01 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of HAVE_CONFIG_H

Browse Source 
It's specific to Autotools.
This commit is contained in:
Sébastien Wilmet 2019-12-05 14:13:31 +01:00
parent 83e3de9c71
commit cf472fd724
30 changed files with 24 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gedit/meson.build
View File

@ -106,12 +106,8 @@ libgedit_sources = files(
'gedit-window.c', 'gedit-window.c',
) )
libgedit_c_args = [ libgedit_c_args = []
'-DHAVE_CONFIG_H', libgedit_link_args = []
]
libgedit_link_args = [
]
libgedit_deps = [ libgedit_deps = [
glib_dep, glib_dep,
@ -291,9 +287,7 @@ gedit_sources = [
'gedit.c', 'gedit.c',
] ]
gedit_c_args = [ gedit_c_args = []
'-DHAVE_CONFIG_H',
]
if windowing_target == 'quartz' if windowing_target == 'quartz'
gedit_c_args += [ gedit_c_args += [

4
plugins/checkupdate/gedit-check-update-plugin.c
View File

@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-check-update-plugin.h" #include "gedit-check-update-plugin.h"

5
plugins/checkupdate/meson.build
View File

@ -7,16 +7,11 @@ libcheckupdate_deps = [
libsoup_dep, libsoup_dep,
] ]
libcheckupdate_c_args = [
'-DHAVE_CONFIG_H',
]
libcheckupdate_sha = shared_module( libcheckupdate_sha = shared_module(
'checkupdate', 'checkupdate',
sources: libcheckupdate_sources, sources: libcheckupdate_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libcheckupdate_deps, dependencies: libcheckupdate_deps,
c_args: libcheckupdate_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

4
plugins/docinfo/gedit-docinfo-plugin.c
View File

@ -18,9 +18,7 @@
* *
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-docinfo-plugin.h" #include "gedit-docinfo-plugin.h"

5
plugins/docinfo/meson.build
View File

@ -6,10 +6,6 @@ libdocinfo_deps = [
libgedit_dep, libgedit_dep,
] ]
libdocinfo_c_args = [
'-DHAVE_CONFIG_H',
]
subdir('resources') subdir('resources')
libdocinfo_sha = shared_module( libdocinfo_sha = shared_module(
@ -17,7 +13,6 @@ libdocinfo_sha = shared_module(
sources: libdocinfo_sources, sources: libdocinfo_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libdocinfo_deps, dependencies: libdocinfo_deps,
c_args: libdocinfo_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

4
plugins/filebrowser/gedit-file-browser-plugin.c
View File

@ -18,9 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include <string.h> #include <string.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>

4
plugins/filebrowser/gedit-file-browser-store.c
View File

@ -18,9 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include <string.h> #include <string.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>

4
plugins/filebrowser/gedit-file-browser-utils.c
View File

@ -18,9 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gedit/gedit-utils.h> #include <gedit/gedit-utils.h>

4
plugins/filebrowser/gedit-file-browser-widget.c
View File

@ -18,9 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

5
plugins/filebrowser/meson.build
View File

@ -23,10 +23,6 @@ libfilebrowser_deps = [
libgedit_dep, libgedit_dep,
] ]
libfilebrowser_c_args = [
'-DHAVE_CONFIG_H',
]
subdir('messages') subdir('messages')
libfilebrowser_register_enums = gnome.mkenums( libfilebrowser_register_enums = gnome.mkenums(
@ -69,7 +65,6 @@ libfilebrowser_sha = shared_module(
sources: libfilebrowser_sources, sources: libfilebrowser_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libfilebrowser_deps, dependencies: libfilebrowser_deps,
c_args: libfilebrowser_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

4
plugins/filebrowser/messages/gedit-file-browser-message-activation.c
View File

@ -21,9 +21,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-activation.h" #include "gedit-file-browser-message-activation.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-add-filter.c
View File

@ -21,9 +21,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-add-filter.h" #include "gedit-file-browser-message-add-filter.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-extend-context-menu.c
View File

@ -22,9 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-extend-context-menu.h" #include "gedit-file-browser-message-extend-context-menu.h"
#include <gedit/gedit-menu-extension.h> #include <gedit/gedit-menu-extension.h>

4
plugins/filebrowser/messages/gedit-file-browser-message-get-root.c
View File

@ -21,9 +21,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-get-root.h" #include "gedit-file-browser-message-get-root.h"
#include "gio/gio.h" #include "gio/gio.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-get-view.c
View File

@ -21,9 +21,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-get-view.h" #include "gedit-file-browser-message-get-view.h"
#include "plugins/filebrowser/gedit-file-browser-view.h" #include "plugins/filebrowser/gedit-file-browser-view.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-id-location.c
View File

@ -22,9 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-id-location.h" #include "gedit-file-browser-message-id-location.h"
#include "gio/gio.h" #include "gio/gio.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-id.c
View File

@ -21,9 +21,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-id.h" #include "gedit-file-browser-message-id.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-set-emblem.c
View File

@ -21,9 +21,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-set-emblem.h" #include "gedit-file-browser-message-set-emblem.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-set-markup.c
View File

@ -22,9 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-set-markup.h" #include "gedit-file-browser-message-set-markup.h"

4
plugins/filebrowser/messages/gedit-file-browser-message-set-root.c
View File

@ -21,9 +21,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-file-browser-message-set-root.h" #include "gedit-file-browser-message-set-root.h"
#include "gio/gio.h" #include "gio/gio.h"

4
plugins/modelines/gedit-modeline-plugin.c
View File

@ -18,9 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gmodule.h> #include <gmodule.h>

5
plugins/modelines/meson.build
View File

@ -7,16 +7,11 @@ libmodelines_deps = [
libgedit_dep, libgedit_dep,
] ]
libmodelines_c_args = [
'-DHAVE_CONFIG_H',
]
libmodelines_sha = shared_module( libmodelines_sha = shared_module(
'modelines', 'modelines',
sources: libmodelines_sources, sources: libmodelines_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libmodelines_deps, dependencies: libmodelines_deps,
c_args: libmodelines_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

4
plugins/quickhighlight/gedit-quick-highlight-plugin.c
View File

@ -18,9 +18,7 @@
* *
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include <glib/gi18n.h> #include <glib/gi18n.h>

5
plugins/quickhighlight/meson.build
View File

@ -6,16 +6,11 @@ libquickhighlight_deps = [
libgedit_dep, libgedit_dep,
] ]
libquickhighlight_c_args = [
'-DHAVE_CONFIG_H',
]
libquickhighlight_sha = shared_module( libquickhighlight_sha = shared_module(
'quickhighlight', 'quickhighlight',
sources: libquickhighlight_sources, sources: libquickhighlight_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libquickhighlight_deps, dependencies: libquickhighlight_deps,
c_args: libquickhighlight_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

4
plugins/sort/gedit-sort-plugin.c
View File

@ -18,9 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include "gedit-sort-plugin.h" #include "gedit-sort-plugin.h"

5
plugins/sort/meson.build
View File

@ -6,10 +6,6 @@ libsort_deps = [
libgedit_dep, libgedit_dep,
] ]
libsort_c_args = [
'-DHAVE_CONFIG_H',
]
subdir('resources') subdir('resources')
libsort_sha = shared_module( libsort_sha = shared_module(
@ -17,7 +13,6 @@ libsort_sha = shared_module(
sources: libsort_sources, sources: libsort_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libsort_deps, dependencies: libsort_deps,
c_args: libsort_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

5
plugins/spell/meson.build
View File

@ -8,10 +8,6 @@ libspell_deps = [
gspell_dep, gspell_dep,
] ]
libspell_c_args = [
'-DHAVE_CONFIG_H',
]
subdir('resources') subdir('resources')
libspell_sha = shared_module( libspell_sha = shared_module(
@ -19,7 +15,6 @@ libspell_sha = shared_module(
sources: libspell_sources, sources: libspell_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libspell_deps, dependencies: libspell_deps,
c_args: libspell_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

4
plugins/time/gedit-time-plugin.c
View File

@ -17,9 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H #include "config.h"
#include <config.h>
#endif
#include <string.h> #include <string.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>

5
plugins/time/meson.build
View File

@ -6,10 +6,6 @@ libtime_deps = [
libgedit_dep, libgedit_dep,
] ]
libtime_c_args = [
'-DHAVE_CONFIG_H',
]
gnome.mkenums( gnome.mkenums(
'org.gnome.gedit.plugins.time.enums.xml', 'org.gnome.gedit.plugins.time.enums.xml',
sources: libtime_sources, sources: libtime_sources,
@ -33,7 +29,6 @@ libtime_sha = shared_module(
sources: libtime_sources, sources: libtime_sources,
include_directories: root_include_dir, include_directories: root_include_dir,
dependencies: libtime_deps, dependencies: libtime_deps,
c_args: libtime_c_args,
install: true, install: true,
install_dir: join_paths( install_dir: join_paths(
pkglibdir, pkglibdir,

6
tools/generate-message.py
View File

@ -585,11 +585,7 @@ class Message:
elif options.lgpl: elif options.lgpl:
self._write_lgpl(options, fname) self._write_lgpl(options, fname)
self._write("#ifdef HAVE_CONFIG_H") self._write('#include "config.h"')
self._write("#include <config.h>")
self._write("#endif")
self._write()
self._write('#include "%s.h"', self.filename) self._write('#include "%s.h"', self.filename)
for inc in self.includes: for inc in self.includes: