Nya, b{ttre Makefiler, som passar CVS.

Makefile

-#  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:
-###############################################################################
-
-# Directories that you might want to override via the environment.
-
-ifndef TOPDIR
-TOPDIR := $(shell pwd)
-endif
-
-ifndef SCRIPTDIR
+TOPDIR = /usr/lyskom/src
 SCRIPTDIR = $(TOPDIR)/scripts
-endif
 
 include $(SCRIPTDIR)/import.make
 
-
-# All directories that make should traverse to when doing clean etc.
-
 SUBDIRS = doc include junk lib scripts src
 
 all:
 	for i in $(SUBDIRS) ;	\
 	do	\
 		echo making all in directory $$i; \
-		(cd $$i; $(MAKE) all)	\
+		(cd $$i; $(MAKE) $(EXPORTS) all)	\
 	done
 
 
@@ -43,16 +17,16 @@ install:
 	for i in $(SUBDIRS) ;	\
 	do	\
 		echo making install in directory $$i; \
-		(cd $$i; $(MAKE) install)	\
+		(cd $$i; $(MAKE) $(EXPORTS) install)	\
 	done
 
 depend:
-	(cd src/include; make install)
-	(cd src/libraries; make install-headers)
+	(cd src/include; make $(EXPORTS) install)
+	(cd src/libraries; make $(EXPORTS) install-headers)
 	for i in $(SUBDIRS) ;	\
 	do	\
 		echo making depend in directory $$i; \
-		(cd $$i; $(MAKE) depend);	\
+		(cd $$i; $(MAKE) $(EXPORTS) depend);	\
 	done
 
 
@@ -61,11 +35,5 @@ clean:
 	for i in $(SUBDIRS); \
 	do \
 	   echo making clean in directory $$i; \
-	   (cd $$i; $(MAKE) clean) \
+	   (cd $$i; $(MAKE) $(EXPORTS) clean) \
 	done
-		
-war:
-	@echo "Thou shalt not make war.  Makest love instead!"
-
-love:
-	@clear; cat /usr/local/lib/makelove

src/Makefile

+TOPDIR = /usr/lyskom/src
+SCRIPTDIR = $(TOPDIR)/scripts
+
+include $(SCRIPTDIR)/import.make
+
 # All directories that make should traverse to when doing clean etc.
 # Note htat libraries MUST be made before the rest. Otherwise you will
 # be linking with old versions...
@@ -8,7 +13,7 @@ all:
 	for i in $(SUBDIRS) ;	\
 	do	\
 		echo making all in directory $$i; \
-		(cd $$i; $(MAKE) all)	\
+		(cd $$i; $(MAKE) $(EXPORTS) all)	\
 	done
 
 
@@ -16,7 +21,7 @@ install:
 	for i in $(SUBDIRS) ;	\
 	do	\
 		echo making install in directory $$i; \
-		(cd $$i; $(MAKE) install)	\
+		(cd $$i; $(MAKE) $(EXPORTS) install)	\
 	done
 
 
@@ -24,7 +29,7 @@ depend:
 	for i in $(SUBDIRS) ;	\
 	do	\
 		echo making depend in directory $$i; \
-		(cd $$i; $(MAKE) depend)	\
+		(cd $$i; $(MAKE) $(EXPORTS) depend)	\
 	done
 
 
@@ -33,6 +38,5 @@ clean:
 	for i in $(SUBDIRS); \
 	do \
 	   echo making clean in directory $$i; \
-	   (cd $$i; $(MAKE) clean) \
+	   (cd $$i; $(MAKE) $(EXPORTS) clean) \
 	done
-