diff options
| author | Rainer Müller <raimue@codingfarm.de> | 2016-09-27 00:29:33 +0200 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2016-09-26 19:16:42 -0400 |
| commit | c79ce843f495b913ddafa383e6cf818ac99b4f15 (patch) | |
| tree | 918226f0eb20b148d8a8140a9463d2f59fdf0e5f /src | |
| parent | 49758cafba9fd7e0663b550debfd51fb21260650 (diff) | |
build: Reorder includes to avoid installed plugin header
When hexchat is already installed into a non-default prefix, a new build
could pick up ${prefix}/include/hexchat-plugin.h from the installed
version instead of the local header, as configuration variables such as
$(GLIB_CFLAGS) would point to -I${prefix}/include.
Reordering the includes and moving -I arguments to CPPFLAGS prevents
this, as it ensures the local directories are always searched first.
This was no problem when compiling for /usr or /usr/local as these
directories in the compiler search path are always searched last.
Closes #1822
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fe-gtk/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am index 11b5d77d..4cbbac24 100644 --- a/src/common/dbus/Makefile.am +++ b/src/common/dbus/Makefile.am @@ -15,7 +15,7 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir)/src/common $(COMMON_CFLAGS) $(DBUS_CFLAGS) noinst_PROGRAMS = example example_SOURCES = example.c diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am index bd00db74..269eaa55 100644 --- a/src/fe-gtk/Makefile.am +++ b/src/fe-gtk/Makefile.am @@ -45,7 +45,7 @@ hexchat_SOURCES = ascii.c banlist.c chanlist.c chanview.c custom-list.c \ maingui.c notifygui.c $(notify_c) palette.c pixmaps.c plugin-tray.c $(plugingui_c) \ plugin-notification.c rawlog.c servlistgui.c setup.c $(iso_codes_c) \ sexy-spell-entry.c textgui.c urlgrab.c userlistgui.c xtext.c -hexchat_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/common +hexchat_CPPFLAGS = -I$(top_builddir)/src/common $(AM_CPPFLAGS) resources_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/hexchat.gresource.xml) |