Changeset b1bc63b in rtems


Ignore:
Timestamp:
Dec 10, 1998, 9:52:36 PM (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
6c980128
Parents:
a3d0b8a
Message:

Fixed conflict between patches

File:
1 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/Makefile.in

    ra3d0b8a rb1bc63b  
    3333LIBHWAPI=$(wildcard libhwapi)
    3434
    35 
    36          $(LIBNETWORKING) $(LIBRPC) $(LIBRDBG) \
    37          $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup
     35ifneq ($(RTEMS_CPU),unix)
    3836LIBCHIP=libchip
    3937endif
    4038
    4139SUB_DIRS=start include $(NETWORKING_INCLUDE) libmisc \
    42          libc $(LIBCHIP) libcpu libbsp $(LIBNETWORKING) \
     40         libc $(LIBCHIP) libcpu libbsp \
     41         $(LIBNETWORKING) $(LIBRPC) $(LIBRDBG) \
    4342         $(LIBHWAPI) $(LIBRTEMSCPLUSPLUS) wrapup
Note: See TracChangeset for help on using the changeset viewer.