From 5a7be8d0cfe2e22d65602630ce5bf6e5eaee28be Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Thu, 29 Aug 1991 06:36:02 +0000
Subject: [PATCH] Minor fixes to make it compile smoothly.
---
Build | 4 ++--
Makefile | 1 +
scripts/import.make | 22 +++++++++++++---------
scripts/sub-binaries.make | 2 +-
scripts/sub-clean.make | 2 +-
scripts/sub-depend.make | 4 +---
scripts/sub-includes.make | 5 +++--
scripts/sub-install.make | 2 +-
scripts/sub-libraries.make | 2 +-
src/Makefile | 12 ++++++------
src/include/Makefile | 12 ++++++------
src/include/server/Makefile | 2 +-
src/libraries/Makefile | 10 +++++-----
src/libraries/libansi/Makefile | 4 +---
src/libraries/libansi/config.h | 2 +-
src/libraries/libcommon/Makefile | 8 +++-----
src/libraries/libmisc/Makefile | 19 +------------------
17 files changed, 48 insertions(+), 65 deletions(-)
diff --git a/Build b/Build
index e0ccd64c8..4bce85b35 100755
--- a/Build
+++ b/Build
@@ -1,3 +1,3 @@
#!/bin/sh
-make TOPDIR=`pwd` depend
-make TOPDIR=`pwd`
+make TOPDIR=`pwd` depend && echo '*** Depend ready. Making binaries. ***' \
+&& make TOPDIR=`pwd`
diff --git a/Makefile b/Makefile
index 58e58591a..bc57d8b79 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ include $(SCRIPTDIR)/sub-install.make
include $(SCRIPTDIR)/sub-clean.make
include $(SCRIPTDIR)/sub-depend.make
+depend: includes
distribution: clean
-$(RM) -r lyskom-$(SERVER-VER)
diff --git a/scripts/import.make b/scripts/import.make
index e0c3cb1e1..907d21251 100644
--- a/scripts/import.make
+++ b/scripts/import.make
@@ -40,15 +40,19 @@ LYSKOMUSRBIN = /usr/local/bin
GENERIC-CLEAN = *~ *.o dependencies core TAGS temp-Makefile temp-?-Makefile
-EXPORTS = CC="${CC}" SHELL="${SHELL}" AWK="${AWK}" SED="${SED}" \
- RM="${RM}" INCLUDEDIR="${INCLUDEDIR}" LIBDIR="${LIBDIR}" \
- ANSIDIR="${ANSIDIR}" INCLUDES="${INCLUDES}" \
- OPTIMIZE-FLAGS="${OPTIMIZE-FLAGS}" \
- MISC-CFLAGS="${MISC-CFLAGS}" PIPE="${PIPE}" \
- LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" \
- LYSKOMSYSBIN="${LYSKOMSYSBIN}" LYSKOMUSRBIN="${LYSKOMUSRBIN}" \
- TOPDIR="${TOPDIR}" SCRIPTDIR="${SCRIPTDIR}" AR="${AR}" \
- ARFLAGS="${ARFLAGS}" GENERIC-CLEAN="${GENERIC-CLEAN}"
+# Too ugly... and it swells...
+#
+# EXPORTS = CC="${CC}" SHELL="${SHELL}" AWK="${AWK}" SED="${SED}" \
+# RM="${RM}" INCLUDEDIR="${INCLUDEDIR}" LIBDIR="${LIBDIR}" \
+# ANSIDIR="${ANSIDIR}" INCLUDES="${INCLUDES}" \
+# OPTIMIZE-FLAGS="${OPTIMIZE-FLAGS}" \
+# MISC-CFLAGS="${MISC-CFLAGS}" PIPE="${PIPE}" \
+# LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" \
+# LYSKOMSYSBIN="${LYSKOMSYSBIN}" LYSKOMUSRBIN="${LYSKOMUSRBIN}" \
+# TOPDIR="${TOPDIR}" SCRIPTDIR="${SCRIPTDIR}" AR="${AR}" \
+# ARFLAGS="${ARFLAGS}" GENERIC-CLEAN="${GENERIC-CLEAN}"
+
+EXPORTS =
# The Makefiles also dependes on the variables
# AR, ARFLAGS
diff --git a/scripts/sub-binaries.make b/scripts/sub-binaries.make
index 059bfdb1d..48ac023fe 100644
--- a/scripts/sub-binaries.make
+++ b/scripts/sub-binaries.make
@@ -1,6 +1,6 @@
.PHONY: binaries
binaries:
- for i in $(SUBDIRS) ; \
+ -for i in $(SUBDIRS) ; \
do \
[ -d $$i ] && { echo making binaries in directory $$i; \
(cd $$i; $(MAKE) $(EXPORTS) binaries) } \
diff --git a/scripts/sub-clean.make b/scripts/sub-clean.make
index d23afa8d4..facec7de3 100644
--- a/scripts/sub-clean.make
+++ b/scripts/sub-clean.make
@@ -1,7 +1,7 @@
.PHONY: clean
clean:
$(RM) $(GENERIC-CLEAN)
- for i in $(SUBDIRS); \
+ -for i in $(SUBDIRS); \
do \
[ -d $$i ] && { echo making clean in directory $$i; \
(cd $$i; $(MAKE) $(EXPORTS) clean) } \
diff --git a/scripts/sub-depend.make b/scripts/sub-depend.make
index c2a7a2f40..c16f5759a 100644
--- a/scripts/sub-depend.make
+++ b/scripts/sub-depend.make
@@ -3,10 +3,8 @@ dependencies:
.PHONY: depend
depend:
- for i in $(SUBDIRS) ; \
+ -for i in $(SUBDIRS) ; \
do \
[ -d $$i ] && { echo making depend in directory $$i; \
(cd $$i; $(MAKE) $(EXPORTS) depend) } \
done
-# No trailing blank line, so that this rule can be continued in
-# the calling file. See src/komutils/Makefile for example.
\ No newline at end of file
diff --git a/scripts/sub-includes.make b/scripts/sub-includes.make
index b701bbfcf..e687db784 100644
--- a/scripts/sub-includes.make
+++ b/scripts/sub-includes.make
@@ -1,7 +1,8 @@
+
.PHONY: includes
includes:
- for i in $(SUBDIRS) ; \
+ -for i in $(SUBDIRS) ; \
do \
- [ -d $$i ] && { (echo making includes in directory $$i; \
+ [ -d $$i ] && { echo making includes in directory $$i; \
(cd $$i; $(MAKE) $(EXPORTS) includes) } \
done
diff --git a/scripts/sub-install.make b/scripts/sub-install.make
index 452447eac..0f6da15c4 100644
--- a/scripts/sub-install.make
+++ b/scripts/sub-install.make
@@ -1,6 +1,6 @@
.PHONY: install
install:
- for i in $(SUBDIRS) ; \
+ -for i in $(SUBDIRS) ; \
do \
[ -d $$i ] && { echo making install in directory $$i; \
(cd $$i; $(MAKE) $(EXPORTS) install) } \
diff --git a/scripts/sub-libraries.make b/scripts/sub-libraries.make
index 46e80dd89..d448b3f09 100644
--- a/scripts/sub-libraries.make
+++ b/scripts/sub-libraries.make
@@ -1,6 +1,6 @@
.PHONY: libraries
libraries:
- for i in $(SUBDIRS) ; \
+ -for i in $(SUBDIRS) ; \
do \
[ -d $$i ] && { echo making libraries in directory $$i; \
(cd $$i; $(MAKE) $(EXPORTS) libraries) } \
diff --git a/src/Makefile b/src/Makefile
index e72781bf0..c44231bd6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,12 +9,12 @@ SUBDIRS = include libraries server komutils clients
all: includes libraries binaries
-include $(SCRIPTDIR)/includes.make
-include $(SCRIPTDIR)/libraries.make
-include $(SCRIPTDIR)/binaries.make
-include $(SCRIPTDIR)/install.make
-include $(SCRIPTDIR)/clean.make
-include $(SCRIPTDIR)/depend.make
+include $(SCRIPTDIR)/sub-includes.make
+include $(SCRIPTDIR)/sub-libraries.make
+include $(SCRIPTDIR)/sub-binaries.make
+include $(SCRIPTDIR)/sub-install.make
+include $(SCRIPTDIR)/sub-clean.make
+include $(SCRIPTDIR)/sub-depend.make
diff --git a/src/include/Makefile b/src/include/Makefile
index ede472f6f..874c74940 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -17,16 +17,16 @@ binaries:;
.PHONY : includes
includes:
- for i in $(INSTALL-HDRS);\
+ for i in $(INSTALL-HDRS) ; \
do \
- { cmp $$i $(INCLUDEDIR)/$$i 2>/dev/null } \
+ ( cmp $$i $(INCLUDEDIR)/$$i 2>/dev/null ) \
|| cp $$i $(INCLUDEDIR)/$$i; \
- done
+ done;
for i in $(SUBDIRS); \
do \
- [ -d $$i ] && { echo making includes in directory $$i; \
- (cd $$i; $(MAKE) $(EXPORTS) includes); } \
- done
+ [ -d $$i ] && ( echo making includes in directory $$i; \
+ (cd $$i; $(MAKE) $(EXPORTS) includes); ) \
+ done;
clean:
$(RM) $(GENERIC-CLEAN)
diff --git a/src/include/server/Makefile b/src/include/server/Makefile
index 8ddae46b4..ff13e37c4 100644
--- a/src/include/server/Makefile
+++ b/src/include/server/Makefile
@@ -17,7 +17,7 @@ includes:
-mkdir $(INCLUDEDIR)/server
for i in $(INSTALL-HDRS);\
do \
- cmp $$i $(INCLUDEDIR)/server/$$i \
+ ( cmp $$i $(INCLUDEDIR)/server/$$i 2>/dev/null ) \
|| cp $$i $(INCLUDEDIR)/server/$$i; \
done
diff --git a/src/libraries/Makefile b/src/libraries/Makefile
index 9ced39ad9..c41133426 100644
--- a/src/libraries/Makefile
+++ b/src/libraries/Makefile
@@ -10,10 +10,10 @@ SUBDIRS = libansi libmisc libisc libcommon client-support
all: includes libraries binaries
-include $(SCRIPTDIR)/includes.make
-include $(SCRIPTDIR)/libraries.make
-include $(SCRIPTDIR)/clean.make
-include $(SCRIPTDIR)/depend.make
-include $(SCRIPTDIR)/install.make
+include $(SCRIPTDIR)/sub-includes.make
+include $(SCRIPTDIR)/sub-libraries.make
+include $(SCRIPTDIR)/sub-clean.make
+include $(SCRIPTDIR)/sub-depend.make
+include $(SCRIPTDIR)/sub-install.make
binaries:;
diff --git a/src/libraries/libansi/Makefile b/src/libraries/libansi/Makefile
index f7df32a9c..0f5c3b56f 100644
--- a/src/libraries/libansi/Makefile
+++ b/src/libraries/libansi/Makefile
@@ -29,12 +29,10 @@ clean:
# Recreate the Makefile
-include $(SCRIPTDIR)/Parallell-depend.make
+include $(SCRIPTDIR)/Single-depend.make
tags:
etags -t *.[hc]
-specials:;
-
include dependencies
diff --git a/src/libraries/libansi/config.h b/src/libraries/libansi/config.h
index 9fe0eaccb..80afad665 100644
--- a/src/libraries/libansi/config.h
+++ b/src/libraries/libansi/config.h
@@ -5,4 +5,4 @@
*/
-/* #define HAVE_STRERROR /* */
+/* #define HAVE_STRERROR */
diff --git a/src/libraries/libcommon/Makefile b/src/libraries/libcommon/Makefile
index 91d30290a..a2815cd00 100644
--- a/src/libraries/libcommon/Makefile
+++ b/src/libraries/libcommon/Makefile
@@ -24,7 +24,7 @@ server-dir:
.PHONY: liblyskom-server.a
liblyskom-server.a: server-dir
- (cd server-dir; make $(EXPORTS) -f ../Makefile ../$@ TARGET=-DSERVER)
+ (cd server-dir;$(MAKE) $(EXPORTS) -f ../Makefile ../$@ TARGET=-DSERVER)
ranlib $@
@@ -33,7 +33,7 @@ liblyskom-server.a: server-dir
.PHONY: liblyskom-client.a
liblyskom-client.a: client-dir
- (cd client-dir; make $(EXPORTS) -f ../Makefile ../$@ TARGET=-DCLIENT)
+ (cd client-dir;$(MAKE) $(EXPORTS) -f ../Makefile ../$@ TARGET=-DCLIENT)
ranlib $@
@@ -59,8 +59,6 @@ tags:
# Recreate the Makefile from Makefile
-include $(SCRIPTDIR)/Parallell-depend.make
-
-specials:;
+include $(SCRIPTDIR)/Single-depend.make
include dependencies
diff --git a/src/libraries/libmisc/Makefile b/src/libraries/libmisc/Makefile
index 38afc9712..550e8a5cc 100644
--- a/src/libraries/libmisc/Makefile
+++ b/src/libraries/libmisc/Makefile
@@ -1,18 +1,3 @@
-# Makefile for LysKOM
-#
-###############################################################################
-#
-# SPECIAL CONSIDERATIONS:
-#
-# - Requires GNU make.
-# - CC, OPTIMIZE-FLAGS and other make variables are passed down
-# in the environment.
-# - C compiler must be ANSI conformant.
-#
-###############################################################################
-#
-# SPECIAL TARGETS:
-###############################################################################
TOPDIR = /usr/lyskom/src
SCRIPTDIR = $(TOPDIR)/scripts
@@ -50,12 +35,10 @@ clean:
# Recreate the Makefile
-include $(SCRIPTDIR)/Parallell-depend.make
+include $(SCRIPTDIR)/Single-depend.make
tags:
etags -t $(INCLUDEDIR)/*.h *.[hc]
-specials: includes;
-
include dependencies
--
GitLab