From 0d78e1703686a7da98fe130ff3501980d7eb9f3f Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 25 Oct 2019 18:06:54 -0600 Subject: [PATCH] DtSvc,DtXinerama: More include fixes to deal with new order. --- cde/lib/DtSvc/DtUtil1/Makefile.am | 3 ++- cde/lib/DtSvc/DtUtil2/Makefile.am | 8 +++++--- cde/lib/DtXinerama/Makefile.am | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cde/lib/DtSvc/DtUtil1/Makefile.am b/cde/lib/DtSvc/DtUtil1/Makefile.am index 726d09d1..0f93e3e6 100644 --- a/cde/lib/DtSvc/DtUtil1/Makefile.am +++ b/cde/lib/DtSvc/DtUtil1/Makefile.am @@ -3,8 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libDtUtil1.la libDtUtil1_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE \ + -I$(top_builddir)/include/Dt \ -DCDE_INSTALLATION_TOP=\"${prefix}\" \ - -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" + -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" if SOLARIS libDtUtil1_la_CFLAGS += -DNO_REGCOMP diff --git a/cde/lib/DtSvc/DtUtil2/Makefile.am b/cde/lib/DtSvc/DtUtil2/Makefile.am index 27d962a7..01fda6e3 100644 --- a/cde/lib/DtSvc/DtUtil2/Makefile.am +++ b/cde/lib/DtSvc/DtUtil2/Makefile.am @@ -2,9 +2,11 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LTLIBRARIES = libDtUtil2.la -libDtUtil2_la_CFLAGS = -DCDE_INSTALLATION_TOP=\"${prefix}\" \ - -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ - -DMULTIBYTE -DUSE_XINERAMA $(TIRPCINC) +libDtUtil2_la_CFLAGS = -I../include $(TIRPCINC) -DMULTIBYTE \ + -I$(top_builddir)/include/Dt \ + -DCDE_INSTALLATION_TOP=\"${prefix}\" \ + -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ + -DMULTIBYTE -DUSE_XINERAMA $(TIRPCINC) libDtUtil2_la_SOURCES = ChkpntClient.c ChkpntListen.c DtEnvMap.c \ diff --git a/cde/lib/DtXinerama/Makefile.am b/cde/lib/DtXinerama/Makefile.am index 547568e9..4b889f1a 100644 --- a/cde/lib/DtXinerama/Makefile.am +++ b/cde/lib/DtXinerama/Makefile.am @@ -2,6 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in lib_LIBRARIES = libDtXinerama.a -libDtXinerama_a_CFLAGS = -fpic +# JET - why? +#libDtXinerama_a_CFLAGS = -fpic libDtXinerama_a_SOURCES = DtXinerama.c -- 2.25.1