From f0b8bbae8fe82ea6cd1d6eef96b1a389c89a1a10 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Mon, 17 Jan 2022 08:07:40 +0100 Subject: [PATCH] lefty: autotools: add 'lib' to include directories An upcoming commit need this in order to be able to add an include of cgraph/exit.h. Towards https://gitlab.com/graphviz/graphviz/-/issues/2178. --- cmd/lefty/Makefile.am | 2 ++ cmd/lefty/ws/mswin32/Makefile.am | 5 ++++- cmd/lefty/ws/x11/Makefile.am | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am index fb4d41cda..ceab3ddd4 100644 --- a/cmd/lefty/Makefile.am +++ b/cmd/lefty/Makefile.am @@ -26,12 +26,14 @@ pdfdir = $(pkgdatadir)/doc/pdf if WITH_WIN32 AM_CPPFLAGS = \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/cmd/lefty/ws/mswin32 \ -I$(top_srcdir)/cmd/lefty/os/mswin32 \ -I$(top_srcdir)/cmd/lefty/dot2l \ $(XMU_CFLAGS) $(XAW_CFLAGS) else AM_CPPFLAGS = \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/cmd/lefty/ws/x11 \ -I$(top_srcdir)/cmd/lefty/os/unix \ -I$(top_srcdir)/cmd/lefty/dot2l \ diff --git a/cmd/lefty/ws/mswin32/Makefile.am b/cmd/lefty/ws/mswin32/Makefile.am index 082da9e76..e0313c2c3 100644 --- a/cmd/lefty/ws/mswin32/Makefile.am +++ b/cmd/lefty/ws/mswin32/Makefile.am @@ -1,6 +1,9 @@ ## Process this file with automake to produce Makefile.in -AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty +AM_CPPFLAGS = \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/cmd/lefty + noinst_HEADERS = gcommon.h resource.h if WITH_WIN32 diff --git a/cmd/lefty/ws/x11/Makefile.am b/cmd/lefty/ws/x11/Makefile.am index 70191f631..2ec816a20 100644 --- a/cmd/lefty/ws/x11/Makefile.am +++ b/cmd/lefty/ws/x11/Makefile.am @@ -12,6 +12,7 @@ endif libws_la_SOURCES = garray.c gbutton.c gcanvas.c gcommon.c glabel.c \ gmenu.c gpcanvas.c gquery.c gscroll.c gtext.c gview.c libws_la_CPPFLAGS = \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/cmd/lefty \ -I$(top_srcdir)/cmd/lefty/ws/x11/libfilereq \ -DFEATURE_X11 \ -- 2.40.0