This patch allows usage of builtin X11 headers and libraries for all
platforms.
The directory imports/x11 can be deleted afterwards.
--
Ulrich Wilkens
Email: m...@uwilkens.de
>From eeccbc4a33e25463033171e4db2dcca542924623 Mon Sep 17 00:00:00 2001
From: Ulrich Wilkens <m...@uwilkens.de>
Date: Thu, 28 Jun 2018 04:29:17 +0200
Subject: [PATCH] Use installed X11 includes and libs
---
cde/Makefile | 2 +-
cde/config/cf/FreeBSD.cf | 5 +----
cde/config/cf/NetBSD.cf | 2 ++
cde/config/cf/OpenBSD.cf | 4 +---
cde/config/cf/sun.cf | 3 +++
cde/config/imake/Makefile.ini | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cde/Makefile b/cde/Makefile
index 46168ce..76a998f 100644
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -131,7 +131,7 @@ Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKES
imake.proto:
cd $(IMAKESRC) && $(MAKE) $(FLAGS)
- $(RM) $(DEPENDSRC)/Makefile.proto
+ $(RM) $(DEPENDSRC)/Makefile.proto $(DEPENDSRC)/.depend
$(DEPENDSRC)/Makefile.proto:
$(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC)
diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index 32b960c..88d224f 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -73,11 +73,8 @@ USE_GCC = UseGcc
# define HasGcc2 YES
#endif
-/* Use installed X11 includes/libs on FreeBSD 11+ */
-#if (OSMajorVersion >= 11)
+/* Use installed X11 includes/libs */
#define UseInstalledX11 YES
-#endif
-
/* For DtHelp TIFF processing routines. */
#ifdef AMD64Architecture
diff --git a/cde/config/cf/NetBSD.cf b/cde/config/cf/NetBSD.cf
index 1379dfa..b5861ea 100644
--- a/cde/config/cf/NetBSD.cf
+++ b/cde/config/cf/NetBSD.cf
@@ -106,6 +106,8 @@ XCOMM operating system: OSName
#define GccGasOption -DGCCUSESGAS
#define AsmDefines -DUSE_GAS
+/* Use installed X11 includes/libs */
+#define UseInstalledX11 YES
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 7ceb358..9402e19 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -148,10 +148,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif
#endif
-/* Use installed versions of Xm and X11 */
-#if OSMajorVersion >= 6
+/* Use installed X11 includes/libs */
# define UseInstalledX11 YES
-#endif
/*
* Compiler Features
diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index 4ce766b..05dc2cc 100644
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -376,6 +376,9 @@ man_keywords:: @@\
#define DependDefines -D__BUILTIN_VA_ARG_INCR
#endif
+/* Use installed X11 includes/libs */
+#define UseInstalledX11 YES
+
#define LdPreLib -L$(BUILDLIBDIR)
#define PamUnixDefines -DPAM_NIS
#define TtLargePICTable YES
diff --git a/cde/config/imake/Makefile.ini b/cde/config/imake/Makefile.ini
index f05a17d..e57026c 100644
--- a/cde/config/imake/Makefile.ini
+++ b/cde/config/imake/Makefile.ini
@@ -11,7 +11,7 @@
BOOTSTRAPCFLAGS =
CC = cc
CDEBUGFLAGS = -O
-INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I../../imports/x11/include/X11
+INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11
CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
SHELL = /bin/sh
RM = rm -f
@@ -47,7 +47,7 @@ relink:
clean:
$(RM) ccimake imake.o imake
$(RM_CMD) \#*
- $(RM) -r Makefile.proto Makefile Makefile.dep bootstrap
+ $(RM) -r Makefile.proto Makefile Makefile.dep bootstrap .depend
depend:
--
1.7.11.5
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
