From 25c5f9b70be439731c3ad8c8b1ffdb4892e758db Mon Sep 17 00:00:00 2001
From: michaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 5 Jun 2000 00:31:36 +0000
Subject: [PATCH] Fixed up conflicts.

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@274 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 support/scripts/build.mak | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/support/scripts/build.mak b/support/scripts/build.mak
index 3a01ae7e..3b2ae2b3 100644
--- a/support/scripts/build.mak
+++ b/support/scripts/build.mak
@@ -74,13 +74,6 @@ tidy:
 	-$(TNP)strip $(BUILD)/bin/*
 
 sdcc-bin: sdcc/sdccconf.h
-<<<<<<< build.mak
-	make -C sdcc sdcc-bin
-	mkdir -p $(BUILD)/bin
-	for i in \
-	sdcc sdcpp link-z80 as-z80 aslink asx8051 sdcdb; \
-	do cp sdcc/bin/$$i$(SE) $(BUILD)/bin/$$i$(E); done
-=======
 	make -C sdcc sdcc-bin CROSS_LIBGC=$(CROSS_LIBGC)
 	mkdir -p $(BUILD)/bin
 	for i in \
@@ -93,7 +86,6 @@ sdcc-misc: sdcc/sdccconf.h
 	for i in \
 	sdcdb; \
 	do cp sdcc/bin/$$i$(SE) $(BUILD)/bin/$$i$(E); done
->>>>>>> 1.1.2.5
 	cp sdcc/sim/ucsim/s51.src/s51$(E) $(BUILD)/bin
 	cp sdcc/sim/ucsim/z80.src/sz80$(E) $(BUILD)/bin
 	cp sdcc/sim/ucsim/avr.src/savr$(E) $(BUILD)/bin
@@ -121,17 +113,10 @@ sdcc-lib-z80:
 sdcc-lib-gen:
 	make -C sdcc sdcc-device
 
-<<<<<<< build.mak
-lcc:
-	make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/
-	cp gbdk-support/lcc/lcc$(E) $(BUILD)/bin
-
-=======
 lcc:
 	make -C gbdk-support/lcc SDCCLIB=$(SDCC_ROOT)/ TNP=$(TNP)
 	cp gbdk-support/lcc/lcc$(SE) $(BUILD)/bin/lcc$(E)
 
->>>>>>> 1.1.2.5
 sdcc/sdccconf.h: sdcc/configure
 ifdef TNP
 	cd sdcc; \
@@ -153,7 +138,4 @@ logged_in:
 	cvs -d$(ROOT_GBDK) login
 	cvs -d$(ROOT_SDCC) login
 	touch logged_in
-<<<<<<< build.mak
-	make update=======
 	make -f build.mak update
->>>>>>> 1.1.2.5
-- 
2.30.2