From f9b58c50dde33f6e583d07379c66cf94977585a5 Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sat, 29 Jul 2000 16:01:54 +0000
Subject: [PATCH] Add common dir in more search paths

git-svn-id: svn://svn.cc65.org/cc65/trunk@226 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 src/ar65/make/gcc.mak | 9 ++++++---
 src/ca65/make/gcc.mak | 9 ++++++---
 src/cc65/make/gcc.mak | 9 ++++++---
 src/cl65/make/gcc.mak | 9 ++++++---
 src/ld65/make/gcc.mak | 9 ++++++---
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/ar65/make/gcc.mak b/src/ar65/make/gcc.mak
index 2333108c2..ed08ec0be 100644
--- a/src/ar65/make/gcc.mak
+++ b/src/ar65/make/gcc.mak
@@ -2,7 +2,10 @@
 # gcc Makefile for ar65
 #
 
-CFLAGS 	= -g -O2 -Wall -I../common
+# Library dir
+COMMON	= ../common
+
+CFLAGS 	= -g -O2 -Wall -I$(COMMON)
 CC	= gcc
 LDFLAGS	=
 
@@ -19,7 +22,7 @@ OBJS = 	add.o		\
     	objdata.o	\
     	objfile.o
 
-LIBS = ../common/common.a
+LIBS = $(COMMON)/common.a
 
 
 EXECS = ar65
@@ -50,6 +53,6 @@ zap:	clean
 .PHONY: depend dep
 depend dep:	$(OBJS:.o=.c)
 	@echo "Creating dependency information"
-	$(CC) -MM $^ > .depend
+	$(CC) -I$(COMMON) -MM $^ > .depend
 
 
diff --git a/src/ca65/make/gcc.mak b/src/ca65/make/gcc.mak
index 807099892..07f63be93 100644
--- a/src/ca65/make/gcc.mak
+++ b/src/ca65/make/gcc.mak
@@ -2,7 +2,10 @@
 # gcc Makefile for ca65
 #
 
-CFLAGS 	= -g -O2 -Wall -I../common
+# Library dir
+COMMON	= ../common
+
+CFLAGS 	= -g -O2 -Wall -I$(COMMON)
 CC	= gcc
 LDFLAGS	=
 
@@ -30,7 +33,7 @@ OBJS =  condasm.o	\
        	toklist.o      	\
 	ulabel.o
 
-LIBS = ../common/common.a
+LIBS = $(COMMON)/common.a
 
 EXECS = ca65
 
@@ -60,6 +63,6 @@ zap:	clean
 .PHONY: depend dep
 depend dep:	$(OBJS:.o=.c)
 	@echo "Creating dependency information"
-	$(CC) -MM $^ > .depend
+	$(CC) -I$(COMMON) -MM $^ > .depend
 
 
diff --git a/src/cc65/make/gcc.mak b/src/cc65/make/gcc.mak
index 392de9e44..e147918dc 100644
--- a/src/cc65/make/gcc.mak
+++ b/src/cc65/make/gcc.mak
@@ -3,9 +3,12 @@
 #
 
 
+# Library dir
+COMMON	= ../common
+
 # Default for the compiler lib search path as compiler define
 CDEFS=-DCC65_INC=\"/usr/lib/cc65/include/\"
-CFLAGS = -O2 -g -Wall -I../common $(CDEFS)
+CFLAGS = -O2 -g -Wall -I$(COMMON) $(CDEFS)
 CC=gcc
 LDFLAGS=
 
@@ -45,7 +48,7 @@ OBJS =	anonname.o	\
 	symtab.o       	\
 	util.o
 
-LIBS = ../common/common.a
+LIBS = $(COMMON)/common.a
 
 EXECS = cc65
 
@@ -75,6 +78,6 @@ zap:	clean
 .PHONY: depend dep
 depend dep:	$(OBJS:.o=.c)
 	@echo "Creating dependency information"
-	$(CC) -MM $^ > .depend
+	$(CC) -I$(COMMON) -MM $^ > .depend
 
 
diff --git a/src/cl65/make/gcc.mak b/src/cl65/make/gcc.mak
index 606da837b..da49adc9c 100644
--- a/src/cl65/make/gcc.mak
+++ b/src/cl65/make/gcc.mak
@@ -2,8 +2,11 @@
 # Makefile for the cl65 compile&link utility
 #
 
+# Library dir
+COMMON	= ../common
+
 CC=gcc
-CFLAGS = -O2 -g -Wall
+CFLAGS = -O2 -g -Wall -I$(COMMON)
 LDFLAGS=
 
 OBJS =	error.o	 	\
@@ -11,7 +14,7 @@ OBJS =	error.o	 	\
 	main.o		\
 	spawn.o
 
-LIBS = ../common/common.a
+LIBS = $(COMMON)/common.a
 
 EXECS = cl65
 
@@ -42,7 +45,7 @@ zap:	clean
 .PHONY: depend dep
 depend dep:	$(OBJS:.o=.c)
 	@echo "Creating dependency information"
-	$(CC) -MM $^ > .depend
+	$(CC) -I$(COMMON) -MM $^ > .depend
 
 
 
diff --git a/src/ld65/make/gcc.mak b/src/ld65/make/gcc.mak
index b0be2f660..7dbb365f2 100644
--- a/src/ld65/make/gcc.mak
+++ b/src/ld65/make/gcc.mak
@@ -2,9 +2,12 @@
 # gcc Makefile for ld65
 #
 
+# Library dir
+COMMON	= ../common
+
 # Default for the compiler lib search path as compiler define
 CDEFS=-DCC65_LIB=\"/usr/lib/cc65/lib/\"
-CFLAGS = -g -O2 -Wall -I../common $(CDEFS)
+CFLAGS = -g -O2 -Wall -I$(COMMON) $(CDEFS)
 CC=gcc
 LDFLAGS=
 
@@ -28,7 +31,7 @@ OBJS = 	bin.o		\
 	segments.o	\
 	target.o
 
-LIBS = ../common/common.a
+LIBS = $(COMMON)/common.a
 
 
 EXECS = ld65
@@ -60,6 +63,6 @@ zap:	clean
 .PHONY: depend dep
 depend dep:	$(OBJS:.o=.c)
 	@echo "Creating dependency information"
-	$(CC) -MM $^ > .depend
+	$(CC) -I$(COMMON) -MM $^ > .depend