X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=12126bc08972021cb05ceabb742d93b1207dd432;hb=354551f6bf617eb9c44c341574c60e0ff5b4fd3b;hp=ba25f2a11deecba1182b3ce331560d6075312d30;hpb=2b3413b64f5d4fcd7c28bce2a065f820c762f103;p=egate.git

diff --git a/Makefile b/Makefile
index ba25f2a..12126bc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,22 @@
 # Europagate, 1994-1995.
 #
 # $Log: Makefile,v $
-# Revision 1.4  1995/02/13 12:34:56  adam
+# Revision 1.9  1995/02/16 18:35:43  quinn
+# Changing order.
+#
+# Revision 1.8  1995/02/16  18:34:06  adam
+# Minor changes.
+#
+# Revision 1.7  1995/02/16  15:01:26  quinn
+# Added zlayer
+#
+# Revision 1.6  1995/02/16  14:47:31  quinn
+# Removed CC
+#
+# Revision 1.5  1995/02/15  17:40:47  adam
+# New module kernel.
+#
+# Revision 1.4  1995/02/13  12:34:56  adam
 # New module ccl.
 #
 # Revision 1.3  1995/02/10  17:21:17  adam
@@ -16,9 +31,15 @@
 #
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=res+log util fml ccl
+<<<<<<< Makefile
+SUBDIR=res+log util fml ccl zlayer kernel
+||||||| 1.8
+SUBDIR=res+log util fml ccl kernel zlayer
+=======
+SUBDIR=res+log util fml ccl zlayer kernel 
+>>>>>>> /tmp/T4a24364
 CFLAGS=-Wall -g -pedantic -ansi 
-CC=gcc
+#CC=gcc
 
 all:
 	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)"; then cd ..; else exit 1; fi; done