diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-12-10 21:52:36 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-12-10 21:52:36 +0000 |
| commit | b1bc63b03cd51d2761f21e7c5f1df90a262ddeee (patch) | |
| tree | 6583b8e8774808e1b123b25b1c04f42047f01208 /c/src/lib/Makefile.in | |
| parent | Patch from Ian Lance Taylor <ian@airs.com>: (diff) | |
| download | rtems-b1bc63b03cd51d2761f21e7c5f1df90a262ddeee.tar.bz2 | |
Fixed conflict between patches
Diffstat (limited to 'c/src/lib/Makefile.in')
| -rw-r--r-- | c/src/lib/Makefile.in | 7 |
1 files 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 |