From 966a0bd7e0690c14c4a8152bb17a307680df789d Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 18 Feb 2021 10:33:30 -0800 Subject: [PATCH] Move default target out of makefile-tail to more specific makefile fragments The default targets differ depending on the display type and whether networking is configured in or not, so it's more appropriate in the individual fragments --- bin/makefile-cygwin.x86_64-x | 2 +- bin/makefile-freebsd.386-x | 2 +- bin/makefile-linux.386-x | 2 +- bin/makefile-linux.armv7l-x | 2 +- bin/makefile-linux.x86_64-x | 2 +- bin/makefile-openbsd.x86_64-x | 2 +- bin/makefile-sunos5.386-x | 2 +- bin/makefile-sunos5.i386-x | 2 +- bin/makefile-sunos5.sparc-x | 2 +- bin/makefile-sunos5.x86_64-x | 2 +- bin/makefile-tail | 3 --- 11 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x index 8196c5a..f280cba 100644 --- a/bin/makefile-cygwin.x86_64-x +++ b/bin/makefile-cygwin.x86_64-x @@ -25,4 +25,4 @@ LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm OBJECTDIR = ../$(RELEASENAME)/ -default : ../$(OSARCHNAME)/lde +default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x index d4cbfe9..1187c8b 100644 --- a/bin/makefile-freebsd.386-x +++ b/bin/makefile-freebsd.386-x @@ -24,4 +24,4 @@ LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm OBJECTDIR = ../$(RELEASENAME)/ -default : ../$(OSARCHNAME)/lde +default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x index 7081981..b25198d 100644 --- a/bin/makefile-linux.386-x +++ b/bin/makefile-linux.386-x @@ -24,4 +24,4 @@ LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm OBJECTDIR = ../$(RELEASENAME)/ -default : ../$(OSARCHNAME)/lde +default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x index b86729e..1f2f156 100644 --- a/bin/makefile-linux.armv7l-x +++ b/bin/makefile-linux.armv7l-x @@ -24,4 +24,4 @@ LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm OBJECTDIR = ../$(RELEASENAME)/ -default : ../$(OSARCHNAME)/lde +default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x index 8196c5a..f280cba 100644 --- a/bin/makefile-linux.x86_64-x +++ b/bin/makefile-linux.x86_64-x @@ -25,4 +25,4 @@ LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm OBJECTDIR = ../$(RELEASENAME)/ -default : ../$(OSARCHNAME)/lde +default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x index 05c1752..b95e5f5 100644 --- a/bin/makefile-openbsd.x86_64-x +++ b/bin/makefile-openbsd.x86_64-x @@ -24,4 +24,4 @@ LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm OBJECTDIR = ../$(RELEASENAME)/ -default : ../$(OSARCHNAME)/lde +default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x index f3a62e1..b22e33b 100644 --- a/bin/makefile-sunos5.386-x +++ b/bin/makefile-sunos5.386-x @@ -47,4 +47,4 @@ DLPIFILES = # $(OBJECTDIR)dlpi.o OBJECTDIR = ../$(RELEASENAME)/ -default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether +default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x index 733023b..74a8bb6 100644 --- a/bin/makefile-sunos5.i386-x +++ b/bin/makefile-sunos5.i386-x @@ -48,4 +48,4 @@ DLPIFILES = $(OBJECTDIR)dlpi.o OBJECTDIR = ../$(RELEASENAME)/ -default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether +default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x index 1540e33..931d228 100644 --- a/bin/makefile-sunos5.sparc-x +++ b/bin/makefile-sunos5.sparc-x @@ -55,4 +55,4 @@ DLPIFILES = $(OBJECTDIR)dlpi.o OBJECTDIR = ../$(RELEASENAME)/ -default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether +default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x index 7f0644e..923544d 100644 --- a/bin/makefile-sunos5.x86_64-x +++ b/bin/makefile-sunos5.x86_64-x @@ -48,4 +48,4 @@ DLPIFILES = $(OBJECTDIR)dlpi.o OBJECTDIR = ../$(RELEASENAME)/ -default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether +default: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether ../$(OSARCHNAME)/ldex diff --git a/bin/makefile-tail b/bin/makefile-tail index 0c58564..dcff93b 100644 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -149,9 +149,6 @@ EXTFILES = $(OBJECTDIR)usrsubr.o # Development targets - copyprotect is OFF here ################################################################################ -default: $(OSARCHDIR)lde $(OSARCHDIR)$(LDENAME) $(OSARCHDIR)ldeether \ - $(OSARCHDIR)tstsout $(OSARCHDIR)setsout - $(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde