From 4959859d6e18a34ff8bd78193163b872c2299e16 Mon Sep 17 00:00:00 2001 From: Joonbum Ko Date: Tue, 24 Aug 2021 19:22:56 +0900 Subject: [PATCH] Fix the misused preset output variables of autoconf Change-Id: Ic46d95687b0b8115278cd9ad388547e86b5ccc40 Signed-off-by: Joonbum Ko --- client/Makefile.am | 4 ++-- common/Makefile.am | 2 +- haltests/Makefile.am | 8 ++++---- src/Makefile.am | 4 ++-- tools/Makefile.am | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index d50c6b2b..fe3632a8 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -18,11 +18,11 @@ libtdm_client_la_CFLAGS = \ $(WARN_CFLAGS) \ $(TDM_CLIENT_CFLAGS) \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/protocol \ + -I$(top_builddir)/protocol \ -I$(top_srcdir)/src \ -I$(top_srcdir)/client libtdm_client_la_SOURCES = \ - $(top_srcdir)/protocol/tdm-protocol.c \ + $(top_builddir)/protocol/tdm-protocol.c \ tdm_client.c diff --git a/common/Makefile.am b/common/Makefile.am index e3f2dbe2..d3c1fe5f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -8,5 +8,5 @@ libtdm_common_la_CFLAGS = \ $(WARN_CFLAGS) \ $(TDM_CFLAGS) \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/protocol \ + -I$(top_builddir)/protocol \ -I$(top_srcdir)/src diff --git a/haltests/Makefile.am b/haltests/Makefile.am index c0da6dea..45f7aa71 100644 --- a/haltests/Makefile.am +++ b/haltests/Makefile.am @@ -28,10 +28,10 @@ tdm_haltests_CXXFLAGS = \ $(CXXFLAGS) \ $(TDM_CFLAGS) \ $(EXTRA_CFLAGS) \ - -I../src \ - -I../include \ - -I../client \ - -I../tools \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/client \ + -I$(top_srcdir)/tools \ -I$(includedir)/gtest \ -fpermissive # The flag -w is used, because there are many warnings in libtdm's sources. diff --git a/src/Makefile.am b/src/Makefile.am index f9616e48..77a34cb4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,11 +7,11 @@ libtdm_la_CFLAGS = \ $(WARN_CFLAGS) \ $(TDM_CFLAGS) \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/protocol \ + -I$(top_builddir)/protocol \ -I$(top_srcdir)/src libtdm_la_SOURCES = \ - $(top_srcdir)/protocol/tdm-protocol.c \ + $(top_builddir)/protocol/tdm-protocol.c \ tdm_backend.c \ tdm_config.c \ tdm_server.c \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 2f072364..163cfced 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -37,7 +37,7 @@ tdm_test_client_LDADD = \ #tdm-monitor tdm_monitor_SOURCES = \ - $(top_srcdir)/protocol/tdm-protocol.c \ + $(top_builddir)/protocol/tdm-protocol.c \ tdm_monitor.c tdm_monitor_LDFLAGS = \ -pie \ @@ -48,5 +48,5 @@ tdm_monitor_CFLAGS = \ $(CFLAGS) \ $(TDM_CFLAGS) \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/protocol \ + -I$(top_builddir)/protocol \ -I$(top_srcdir)/src -- 2.34.1