From b8575ab611bba11c86f0b199166e06653ab8a072 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 16 Aug 2001 21:01:31 +0000 Subject: 2001-08-16 Joel Sherrill * pppd/example/Makefile: Removed. * pppd/example/Makefile-user: Added was Makefile. Renamed to avoid bootstrap -c clobbering it. --- c/src/exec/libnetworking/ChangeLog | 6 ++++ c/src/libnetworking/ChangeLog | 6 ++++ c/src/libnetworking/pppd/example/Makefile | 45 -------------------------- c/src/libnetworking/pppd/example/Makefile-user | 45 ++++++++++++++++++++++++++ c/src/libnetworking/pppd/example/README | 4 ++- 5 files changed, 60 insertions(+), 46 deletions(-) delete mode 100644 c/src/libnetworking/pppd/example/Makefile create mode 100644 c/src/libnetworking/pppd/example/Makefile-user (limited to 'c') diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog index 953d9eaf5a..bb87d86154 100644 --- a/c/src/exec/libnetworking/ChangeLog +++ b/c/src/exec/libnetworking/ChangeLog @@ -1,3 +1,9 @@ +2001-08-16 Joel Sherrill + + * pppd/example/Makefile: Removed. + * pppd/example/Makefile-user: Added was Makefile. Renamed to + avoid bootstrap -c clobbering it. + 2001-08-16 Mike Siers * Update of PPPD to 2.3.11 from 2.3.5 and addition of an example diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog index 953d9eaf5a..bb87d86154 100644 --- a/c/src/libnetworking/ChangeLog +++ b/c/src/libnetworking/ChangeLog @@ -1,3 +1,9 @@ +2001-08-16 Joel Sherrill + + * pppd/example/Makefile: Removed. + * pppd/example/Makefile-user: Added was Makefile. Renamed to + avoid bootstrap -c clobbering it. + 2001-08-16 Mike Siers * Update of PPPD to 2.3.11 from 2.3.5 and addition of an example diff --git a/c/src/libnetworking/pppd/example/Makefile b/c/src/libnetworking/pppd/example/Makefile deleted file mode 100644 index 69cc8aab50..0000000000 --- a/c/src/libnetworking/pppd/example/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Makefile -# - -# -# RTEMS_MAKEFILE_PATH is typically set in an environment variable -# - -EXEC=ppptest.exe -PGM=${ARCH}/$(EXEC) - -# optional managers required -MANAGERS=io event semaphore - -# C source names -CSRCS = init.c pppdapp.c - -COBJS_ = $(CSRCS:.c=.o) -COBJS = $(COBJS_:%=${ARCH}/%) - -# C++ source names -CXXSRCS = -CXXOBJS_ = $(CXXSRCS:.cc=.o) -CXXOBJS = $(CXXOBJS_:%=${ARCH}/%) - -# AS source names -ASSRCS = -ASOBJS_ = $(ASSRCS:.s=.o) -ASOBJS = $(ASOBJS_:%=${ARCH}/%) - -# Libraries -LIBS = -lrtemsall -lc - -include $(RTEMS_MAKEFILE_PATH)/Makefile.inc - -include $(RTEMS_CUSTOM) -include $(PROJECT_ROOT)/make/leaf.cfg - -OBJS= $(COBJS) $(CXXOBJS) $(ASOBJS) - -all: ${ARCH} $(PGM) - -$(PGM): $(OBJS) - $(make-exe) - diff --git a/c/src/libnetworking/pppd/example/Makefile-user b/c/src/libnetworking/pppd/example/Makefile-user new file mode 100644 index 0000000000..69cc8aab50 --- /dev/null +++ b/c/src/libnetworking/pppd/example/Makefile-user @@ -0,0 +1,45 @@ +# +# Makefile +# + +# +# RTEMS_MAKEFILE_PATH is typically set in an environment variable +# + +EXEC=ppptest.exe +PGM=${ARCH}/$(EXEC) + +# optional managers required +MANAGERS=io event semaphore + +# C source names +CSRCS = init.c pppdapp.c + +COBJS_ = $(CSRCS:.c=.o) +COBJS = $(COBJS_:%=${ARCH}/%) + +# C++ source names +CXXSRCS = +CXXOBJS_ = $(CXXSRCS:.cc=.o) +CXXOBJS = $(CXXOBJS_:%=${ARCH}/%) + +# AS source names +ASSRCS = +ASOBJS_ = $(ASSRCS:.s=.o) +ASOBJS = $(ASOBJS_:%=${ARCH}/%) + +# Libraries +LIBS = -lrtemsall -lc + +include $(RTEMS_MAKEFILE_PATH)/Makefile.inc + +include $(RTEMS_CUSTOM) +include $(PROJECT_ROOT)/make/leaf.cfg + +OBJS= $(COBJS) $(CXXOBJS) $(ASOBJS) + +all: ${ARCH} $(PGM) + +$(PGM): $(OBJS) + $(make-exe) + diff --git a/c/src/libnetworking/pppd/example/README b/c/src/libnetworking/pppd/example/README index 786d03844b..969745f3a2 100644 --- a/c/src/libnetworking/pppd/example/README +++ b/c/src/libnetworking/pppd/example/README @@ -3,4 +3,6 @@ # This is an example user application using pppd. It is built using -the RTEMS application Makefiles. +the RTEMS application Makefiles. The file Makefile-user should +be renamed to Makefile or the -f option given to make. The file +is renamed to avoid bootstrap -c removing it. -- cgit v1.2.3