* M Makefile

* M        Parallell-depend.make
* M        import.make
=====================================================
Uppsnyggning.

scripts/Makefile

 all:;
 depend:;
 install:;
+	
 
 clean:
 	rm -vf *~ core

scripts/Parallell-depend.make

@@ -3,24 +3,24 @@
 
 depend: temp-A-Makefile
 	rm -f dependencies
-	cat temp-?-Makefile				>dependencies
+	cat temp-?-Makefile >dependencies
 	rm temp-?-Makefile temp-?-files
 	echo depend ready.
 
 temp-A-Makefile: c-indexes specials
-	-$(CC) -M ${TARGET} ${INCLUDES} `cat temp-A-files`     >temp-A-Makefile
+	-$(CC) -M $(CFLAGS) `cat temp-A-files`     >temp-A-Makefile
 
 temp-B-Makefile: c-indexes specials
-	-$(CC) -M ${TARGET} ${INCLUDES} `cat temp-B-files`     >temp-B-Makefile
+	-$(CC) -M ${CFLAGS} `cat temp-B-files`     >temp-B-Makefile
 
 temp-C-Makefile: c-indexes specials
-	-$(CC) -M ${TARGET} ${INCLUDES} `cat temp-C-files`     >temp-C-Makefile
+	-$(CC) -M ${CFLAGS} `cat temp-C-files`     >temp-C-Makefile
 
 temp-D-Makefile: c-indexes specials
-	-$(CC) -M ${TARGET} ${INCLUDES} `cat temp-D-files`     >temp-D-Makefile
+	-$(CC) -M ${CFLAGS} `cat temp-D-files`     >temp-D-Makefile
 
 temp-E-Makefile: c-indexes specials
-	-$(CC) -M ${TARGET} ${INCLUDES} `cat temp-E-files`     >temp-E-Makefile
+	-$(CC) -M ${CFLAGS} `cat temp-E-files`     >temp-E-Makefile
 
 c-indexes: 
 	ls *.c|${AWK} '{ a[i++] = $$1; }				\

scripts/import.make

@@ -7,61 +7,38 @@
 # ceder is guilty.
 #
 
-ifndef SHELL
 SHELL=/bin/sh
-endif
-
-ifndef INCLUDEDIR
-INCLUDEDIR = $(TOPDIR)/include
-endif
-
-ifndef LIBDIR
-LIBDIR = $(TOPDIR)/lib
-endif
-
-ifndef ANSIDIR
-ANSIDIR = $(INCLUDEDIR)/ansi
-endif
-
-# Used programs.
-
-ifndef AWK
 AWK = gawk
-endif
-
-ifndef SED
 SED = /usr/bin/sed
-endif
-
-ifndef CC
-CC = /usr/gnu/bin/gcc -ansi
-endif
-
-ifndef RM
+CC = gcc -ansi
 RM = /usr/gnu/bin/rm -vf
-endif
 
-# Flags to the C compiler
+INCLUDEDIR	= $(TOPDIR)/include
+LIBDIR		= $(TOPDIR)/lib
+ANSIDIR		= $(INCLUDEDIR)/ansi
 
-ifndef INCLUDES
 INCLUDES = -I$(ANSIDIR) -I$(INCLUDEDIR)
-endif
-
-ifndef OPTIMIZE-FLAGS
 OPTIMIZE-FLAGS = -O
-endif
-
-ifndef MISC-CFLAGS
 MISC-CFLAGS = -g -Wall
-endif
+PIPE = -pipe
 
-ifndef LDFLAGS
 # -h flag makes NULL pointer references generate runtime errors
 LDFLAGS = -h -L$(LIBDIR)
-endif
-
-# Force CFLAGS to always follow the settings of INCLUDES,
-# OPTIMIZE-FLAGS and MISC-CFLAGS.
-# Set PIPE=-pipe if you want to.
 
 CFLAGS =  $(INCLUDES)  $(OPTIMIZE-FLAGS)  $(MISC-CFLAGS) $(PIPE) $(TARGET)
+
+# LysKOM executables that the typical user don't use go here.
+# (The server, dbck, et c)
+
+LYSKOMSYSBIN = /usr/lyskom/bin
+
+# User executables (such as lyskom, kompost et c)
+
+LYSKOMUSRBIN = /usr/local/bin
+
+EXPORT = CC="$CC" SHELL="$SHELL" AWK="$AWK" SED="$SED" CC="$CC" 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"