From 3a9d9e1e12c9be82b84cc3f0444616d1f7a6067c Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 20 Jun 2011 07:25:09 +0000
Subject: =?UTF-8?q?2011-06-20=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* pppd/Makefile.am: Add ppp.conf, pppd.options to EXTRA_DIST.
	* pppd/Makefile-user: Remove.
---
 testsuites/samples/pppd/Makefile-user | 45 -----------------------------------
 testsuites/samples/pppd/Makefile.am   |  4 ++++
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 testsuites/samples/pppd/Makefile-user

(limited to 'testsuites/samples/pppd')

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
-- 
cgit v1.2.3