From 9fa380ef52bb8ede43a7fa7b4fa6033b518aff41 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Dec 2003 21:21:38 +0000 Subject: 2003-12-01 Ralf Corsepius * base_mp/Makefile.am: Reformat. * base_mp/node1/Makefile.am: Remove all-local: $(ARCH). * base_mp/node2/Makefile.am: Remove all-local: $(ARCH). * base_sp/Makefile.am: Remove all-local: $(ARCH). * cdtest/Makefile.am: Remove all-local: $(ARCH). * fileio/Makefile.am: Remove all-local: $(ARCH). * hello/Makefile.am: Remove all-local: $(ARCH). * loopback/Makefile.am: Remove all-local: $(ARCH). * minimum/Makefile.am: Remove all-local: $(ARCH). * paranoia/Makefile.am: Remove all-local: $(ARCH). * pppd/Makefile.am: Remove all-local: $(ARCH). * ticker/Makefile.am: Remove all-local: $(ARCH). * unlimited/Makefile.am: Remove all-local: $(ARCH). --- testsuites/samples/base_mp/Makefile.am | 1 - testsuites/samples/base_mp/node1/Makefile.am | 3 +-- testsuites/samples/base_mp/node2/Makefile.am | 3 +-- testsuites/samples/base_sp/Makefile.am | 3 +-- testsuites/samples/cdtest/Makefile.am | 3 +-- testsuites/samples/fileio/Makefile.am | 4 +--- testsuites/samples/hello/Makefile.am | 3 +-- testsuites/samples/loopback/Makefile.am | 4 +--- testsuites/samples/minimum/Makefile.am | 3 +-- testsuites/samples/paranoia/Makefile.am | 3 +-- testsuites/samples/pppd/Makefile.am | 6 ++---- testsuites/samples/ticker/Makefile.am | 3 +-- testsuites/samples/unlimited/Makefile.am | 3 +-- 13 files changed, 13 insertions(+), 29 deletions(-) (limited to 'testsuites/samples') diff --git a/testsuites/samples/base_mp/Makefile.am b/testsuites/samples/base_mp/Makefile.am index c9d9638c6b..7479446f38 100644 --- a/testsuites/samples/base_mp/Makefile.am +++ b/testsuites/samples/base_mp/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SUBDIRS = node1 node2 EXTRA_DIST = apptask.c init.c system.h diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am index 10afb291e4..5d8f4e23ce 100644 --- a/testsuites/samples/base_mp/node1/Makefile.am +++ b/testsuites/samples/base_mp/node1/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/.. NODE = 1 @@ -40,7 +39,7 @@ if HAS_MP ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) else all-local: endif diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am index 5d912c0680..c62af181ea 100644 --- a/testsuites/samples/base_mp/node2/Makefile.am +++ b/testsuites/samples/base_mp/node2/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/.. NODE = 2 @@ -40,7 +39,7 @@ if HAS_MP ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(ARCH) $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) else all-local: endif diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am index 0c5b0ac218..fae7ee9820 100644 --- a/testsuites/samples/base_sp/Makefile.am +++ b/testsuites/samples/base_sp/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = base_sp PGM = ${ARCH}/$(SAMPLE).exe @@ -31,7 +30,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am index ebe262ac92..ef96e3ae5f 100644 --- a/testsuites/samples/cdtest/Makefile.am +++ b/testsuites/samples/cdtest/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = cdtest PGM = ${ARCH}/$(SAMPLE).exe @@ -38,7 +37,7 @@ if HAS_CXX ${PGM}: $(OBJS) $(LINK_FILES) $(make-cxx-exe) -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) else all-local: endif diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am index eab6dbba35..86052a5d92 100644 --- a/testsuites/samples/fileio/Makefile.am +++ b/testsuites/samples/fileio/Makefile.am @@ -2,7 +2,6 @@ ## Makefile.am,v 1.9 2002/08/11 05:18:59 ralf Exp ## - SAMPLE = fileio PGM = ${ARCH}/$(SAMPLE).exe @@ -32,7 +31,7 @@ include $(top_srcdir)/sample.am # if LIBCHIP -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) @@ -41,4 +40,3 @@ endif EXTRA_DIST = $(C_FILES) $(DOCS) include $(top_srcdir)/../automake/local.am - diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am index 16680298f1..d4e1903c61 100644 --- a/testsuites/samples/hello/Makefile.am +++ b/testsuites/samples/hello/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = hello PGM = ${ARCH}/$(SAMPLE).exe @@ -31,7 +30,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am index dfbfcb32c4..03e83c5272 100644 --- a/testsuites/samples/loopback/Makefile.am +++ b/testsuites/samples/loopback/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = loopback PGM = ${ARCH}/$(SAMPLE).exe @@ -28,9 +27,8 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # - if HAS_NETWORKING -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am index a4c68d234e..c7674e2139 100644 --- a/testsuites/samples/minimum/Makefile.am +++ b/testsuites/samples/minimum/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = minimum PGM = ${ARCH}/$(SAMPLE).exe @@ -28,7 +27,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) # This test should not be executed ${PGM}: $(OBJS) $(LINK_FILES) diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am index 0934a517b7..f2a1821011 100644 --- a/testsuites/samples/paranoia/Makefile.am +++ b/testsuites/samples/paranoia/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = paranoia PGM = ${ARCH}/$(SAMPLE).exe @@ -37,7 +36,7 @@ AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN LD_LIBS = -lm -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am index 5a0bd43ce8..1fe1a423f1 100644 --- a/testsuites/samples/pppd/Makefile.am +++ b/testsuites/samples/pppd/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = pppd PGM = ${ARCH}/$(SAMPLE).exe @@ -11,7 +10,7 @@ MANAGERS = io event semaphore C_FILES = init.c pppdapp.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) -H_FILES = netconfig.h system.h +H_FILES = netconfig.h system.h SRCS = $(C_FILES) $(H_FILES) OBJS = $(C_O_FILES) @@ -27,9 +26,8 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # - if HAS_NETWORKING -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am index 7d5d0a4b21..6fbb0da341 100644 --- a/testsuites/samples/ticker/Makefile.am +++ b/testsuites/samples/ticker/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = ticker PGM = ${ARCH}/$(SAMPLE).exe @@ -31,7 +30,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am index 9041fb4bed..a7c2a644ae 100644 --- a/testsuites/samples/unlimited/Makefile.am +++ b/testsuites/samples/unlimited/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - SAMPLE = unlimited PGM = ${ARCH}/$(SAMPLE).exe @@ -31,7 +30,7 @@ include $(top_srcdir)/sample.am # (OPTIONAL) Add local stuff here using += # -all-local: ${ARCH} $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -- cgit v1.2.3