diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-08 12:48:58 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-08 12:48:58 +0000 |
| commit | 323dcc595440185893a36110372f2fcfda091c13 (patch) | |
| tree | 50278f0fbe63a21ed660d6d36aa24ce28340c5dc | |
| parent | 4bf9e8ade0b5edf036180dd5eec019a4a521098a (diff) | |
| download | ATCD-323dcc595440185893a36110372f2fcfda091c13.tar.gz | |
ChangeLogTag:Fri Dec 8 06:47:12 2000 Christopher Kohlhoff <chris@kohlhoff.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | tests/Makefile.bor | 11 |
4 files changed, 28 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index bde1af3d748..1c1d1f3fc04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Dec 8 06:47:12 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * tests/Makefile.bor: + + Use variable called TARGET_NAME instead of NAME to + prevent clash with nightly build scripts. + Thu Dec 7 13:16:23 2000 Darrell Brunsch <brunsch@uci.edu> * examples/IPC_SAP/SPIPE_SAP/server.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index bde1af3d748..1c1d1f3fc04 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Dec 8 06:47:12 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * tests/Makefile.bor: + + Use variable called TARGET_NAME instead of NAME to + prevent clash with nightly build scripts. + Thu Dec 7 13:16:23 2000 Darrell Brunsch <brunsch@uci.edu> * examples/IPC_SAP/SPIPE_SAP/server.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index bde1af3d748..1c1d1f3fc04 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Dec 8 06:47:12 2000 Christopher Kohlhoff <chris@kohlhoff.com> + + * tests/Makefile.bor: + + Use variable called TARGET_NAME instead of NAME to + prevent clash with nightly build scripts. + Thu Dec 7 13:16:23 2000 Darrell Brunsch <brunsch@uci.edu> * examples/IPC_SAP/SPIPE_SAP/server.cpp: diff --git a/tests/Makefile.bor b/tests/Makefile.bor index 5b5a5724bb7..1433a0d5f49 100644 --- a/tests/Makefile.bor +++ b/tests/Makefile.bor @@ -96,16 +96,20 @@ TESTS = \ UPIPE_SAP_Test \ XtReactor_Test -!ifndef NAME +!ifdef TARGET_NAME +NAME = $(TARGET_NAME) +!else +!undef NAME + all: $(TESTS) $(TESTS): - $(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) + $(MAKE) -fMakefile.bor -DTARGET_NAME=$@ $(MAKE_FLAGS) clean: $(TESTS:_Test=_Test.Clean) $(TESTS:_Test=_Test.Clean): - $(MAKE) -fMakefile.bor -DNAME=$(@:.Clean=) $(MAKE_FLAGS) clean + $(MAKE) -fMakefile.bor -DTARGET_NAME=$(@:.Clean=) $(MAKE_FLAGS) clean !endif OBJFILES = $(OBJDIR)\$(NAME).obj @@ -117,4 +121,3 @@ CPPDIR = . LIBFILES = $(ACE_LIB) !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> - |