From b1bc63b03cd51d2761f21e7c5f1df90a262ddeee Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 10 Dec 1998 21:52:36 +0000
Subject: [PATCH] Fixed conflict between patches

---
 c/src/lib/Makefile.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/Makefile.in b/c/src/lib/Makefile.in
index 23bbc6ab0a..cd00f20f70 100644
--- a/c/src/lib/Makefile.in
+++ b/c/src/lib/Makefile.in
@@ -32,12 +32,11 @@ LIBRTEMSCPLUSPLUS = $(LIBRTEMSCPLUSPLUS_$(HAS_CPLUSPLUS)_V)
 # General Hardware API library 
 LIBHWAPI=$(wildcard libhwapi)
 
-
-         $(LIBNETWORKING) $(LIBRPC) $(LIBRDBG) \
-	 $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup
+ifneq ($(RTEMS_CPU),unix)
 LIBCHIP=libchip
 endif
 
 SUB_DIRS=start include $(NETWORKING_INCLUDE) libmisc \
-         libc $(LIBCHIP) libcpu libbsp $(LIBNETWORKING) \
+         libc $(LIBCHIP) libcpu libbsp \
+         $(LIBNETWORKING) $(LIBRPC) $(LIBRDBG) \
          $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup