From c728571c5f285e1dc00cd65f43c7c6957d94b953 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 17 Dec 2020 01:53:38 +0700 Subject: [PATCH] Remove commented out CLXFLAGS from non-SunOS makefiles. (#83) CLX was an alternate client library for X11, isn't really supported by Maiko, and is unlikely to be in the future on these platforms. --- bin/makefile-darwin.386-x | 2 +- bin/makefile-darwin.aarch64-x | 2 +- bin/makefile-darwin.x86_64-x | 2 +- bin/makefile-freebsd.386-x | 2 +- bin/makefile-init.386 | 2 +- bin/makefile-linux.386-x | 2 +- bin/makefile-linux.armv7l-x | 2 +- bin/makefile-linux.x86_64-x | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index 86ea8b1..d2dd5be 100644 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -15,7 +15,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x index d020b28..cd71fb8 100644 --- a/bin/makefile-darwin.aarch64-x +++ b/bin/makefile-darwin.aarch64-x @@ -15,7 +15,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index 81f8818..4171c7a 100644 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -15,7 +15,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x index 7b1419d..77d9e9a 100644 --- a/bin/makefile-freebsd.386-x +++ b/bin/makefile-freebsd.386-x @@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -I/usr/local/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -I/usr/local/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-init.386 b/bin/makefile-init.386 index b47cd1a..56c35e7 100644 --- a/bin/makefile-init.386 +++ b/bin/makefile-init.386 @@ -15,7 +15,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it OPTFLAGS = -O0 -g diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x index 07d14fa..6726721 100644 --- a/bin/makefile-linux.386-x +++ b/bin/makefile-linux.386-x @@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x index 07d14fa..6726721 100644 --- a/bin/makefile-linux.armv7l-x +++ b/bin/makefile-linux.armv7l-x @@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) # This is to make the %$#@! Apollo cc happy OEXT = .o diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x index dee8734..40ffb9b 100644 --- a/bin/makefile-linux.x86_64-x +++ b/bin/makefile-linux.x86_64-x @@ -15,7 +15,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \ XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS) +XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) # This is to make the %$#@! Apollo cc happy OEXT = .o