3 files changed, 9 insertions, 45 deletions
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog
index 779097dd90..09a87997ca 100644
--- a/testsuites/samples/ChangeLog
+++ b/testsuites/samples/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-20	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* pppd/Makefile.am: Add ppp.conf, pppd.options to EXTRA_DIST.
+	* pppd/Makefile-user: Remove.
+
 2011-06-11	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* fileio/init.c: Avoid use of deprecated rtems_clock_get() except in
diff --git a/testsuites/samples/pppd/Makefile-user b/testsuites/samples/pppd/Makefile-user
deleted file mode 100644
index 69cc8aab50..0000000000
--- a/testsuites/samples/pppd/Makefile-user
+++ /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/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 1d448afa65..0ec23cde40 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -22,4 +22,8 @@ pppd$(EXEEXT): $(pppd_OBJECTS) $(pppd_DEPENDENCIES)
 	@rm -f pppd$(EXEEXT)
 	$(make-exe)
 
+EXTRA_DIST =
+EXTRA_DIST += ppp.conf
+EXTRA_DIST += pppd.options
+
 include $(top_srcdir)/../automake/local.am