diff --git a/Build b/Build
index e0ccd64c857c20bd41a9311085a530496656697e..4bce85b35464e663ca7148ccf6a6daea93ebb432 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 58e58591a421b95b2ef7f70d5cf8f35203a3b2be..bc57d8b797bb1e070417eac7f370f8f7e7b134ac 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 e0c3cb1e1389f22545bd1a446143c323f6184279..907d212516e30658a0ad7788dddb8f514fef1e14 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 059bfdb1d7ef54befaf962d5582ad4574324b2ab..48ac023febd3d72a8354fb1908b146e28d1fabc3 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 d23afa8d44bc18ed865914a29241408f2b2b7b2e..facec7de344dd3ac52b1e4996c8f87f50f74fc3d 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 c2a7a2f4035b55b18edf5f7f909926556f7b181e..c16f5759aa9a05372184e7a6de35c1648ae15374 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 b701bbfcf132186e7d6fc9b290a2bae39ad28dc8..e687db7840d6d3a73514da84a0c783a8cd1abce5 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 452447eac17efb755265ef99832b2ce2b48905bb..0f6da15c4b3118c052fee76b1b033a14a5802785 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 46e80dd89f42cdf381a319ec5b747944e636a325..d448b3f09dc11dbe58e25314c1d1c800525fb154 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 e72781bf023969217c8bb56eebe5058cd1a9dddc..c44231bd60331a466c5548bf602457efe5adf7ce 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 ede472f6f166ed4733745bcb38033bf6286dae24..874c74940706ce6aa6438b124b5b6a1ea6c1e395 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 8ddae46b4d25e752e8c07dbb1df428e3627d4f36..ff13e37c4102e669cbf56f6f1f5843801e9a5da7 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 9ced39ad9bb2b5acdca8dd5d740fc0cd46b8b7e6..c41133426980b45e24ce357be023b27a5aec5d37 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 f7df32a9cb2f5d27e23c5e11f12a23a0431fd1a2..0f5c3b56f7422d2135d34c30c680899f5ac44d88 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 9fe0eaccb0b468492fcd545ace08e347f9109505..80afad6651a9097ddbd68090017595f1c8d833a1 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 91d30290a7e327e5dcc06bbdf503d85529cf0044..a2815cd00648928ecf5149afdf0c77016bb8f008 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 38afc971234958262de84d9188ecb7dcd241afd2..550e8a5cc6a6cb8021037c17939c96771e2a6add 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