summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>1998-04-04 00:50:26 +0000
committerSteve Huston <shuston@riverace.com>1998-04-04 00:50:26 +0000
commit62c2a340fcbe506a068c3c2ba24ece266e7fb809 (patch)
tree245acc034f33f15bec1fb392f416818d3f72c67f
parent31b22722dc812c0fee524286fb292a5f5ebfc5d8 (diff)
downloadATCD-62c2a340fcbe506a068c3c2ba24ece266e7fb809.tar.gz
Changed to match today's changes to rules.bin.GNU
Diffstat
-rw-r--r--apps/JAWS/clients/Blobby/Makefile8
-rw-r--r--apps/JAWS/clients/Caching/Makefile12
-rw-r--r--examples/ASX/Event_Server/Event_Server/Makefile8
-rw-r--r--examples/ASX/UPIPE_Event_Server/Makefile8
-rw-r--r--examples/Logger/simple-server/Makefile6
-rw-r--r--examples/Mem_Map/IO-tests/Makefile6
-rw-r--r--examples/Reactor/Multicast/Makefile5
-rw-r--r--examples/Service_Configurator/Misc/Makefile5
-rw-r--r--examples/Shared_Malloc/Makefile6
9 files changed, 24 insertions, 40 deletions
diff --git a/apps/JAWS/clients/Blobby/Makefile b/apps/JAWS/clients/Blobby/Makefile
index 1f8146d01ee..fecef14c8c2 100644
--- a/apps/JAWS/clients/Blobby/Makefile
+++ b/apps/JAWS/clients/Blobby/Makefile
@@ -1,5 +1,5 @@
#----------------------------------------------------------------------------
-# %W% %G%
+# $Id$
#
# Makefile for the ACE Adapter Web Server (JAWS) client
#----------------------------------------------------------------------------
@@ -14,9 +14,8 @@ FILES = Blob \
Blob_Handler \
Options
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
BUILD = $(VBIN)
@@ -28,7 +27,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/apps/JAWS/clients/Caching/Makefile b/apps/JAWS/clients/Caching/Makefile
index ae298ea8249..39583824f0b 100644
--- a/apps/JAWS/clients/Caching/Makefile
+++ b/apps/JAWS/clients/Caching/Makefile
@@ -1,5 +1,5 @@
#----------------------------------------------------------------------------
-# %W% %G%
+# $Id$
#
# Makefile for the ACE Adapter Web Server (JAWS) client
#----------------------------------------------------------------------------
@@ -12,13 +12,10 @@ BIN = http_client
FILES = http_handler
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(LDLIBS) $(VBIN)
+BUILD = $(VBIN)
#----------------------------------------------------------------------------
# Include macros and targets
@@ -28,7 +25,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile
index f352fa43fa0..200c509bc7d 100644
--- a/examples/ASX/Event_Server/Event_Server/Makefile
+++ b/examples/ASX/Event_Server/Event_Server/Makefile
@@ -1,5 +1,5 @@
#----------------------------------------------------------------------------
-# @(#)Makefile 1.1 10/18/96
+# $Id$
#
# Makefile for the Event Server test
#----------------------------------------------------------------------------
@@ -16,9 +16,8 @@ FILES = Options \
Consumer_Router \
Peer_Router
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
BUILD = $(VBIN)
@@ -30,7 +29,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile
index 439e7e7cd4f..7c1e8dd9147 100644
--- a/examples/ASX/UPIPE_Event_Server/Makefile
+++ b/examples/ASX/UPIPE_Event_Server/Makefile
@@ -1,5 +1,5 @@
#----------------------------------------------------------------------------
-# @(#)Makefile 1.1 10/18/96
+# $Id$
#
# Makefile for the Event Server test
#----------------------------------------------------------------------------
@@ -16,9 +16,8 @@ FILES = Options \
Consumer_Router \
Peer_Router
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
BUILD = $(VBIN)
@@ -30,7 +29,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile
index 274b03a3c71..75c037b4c29 100644
--- a/examples/Logger/simple-server/Makefile
+++ b/examples/Logger/simple-server/Makefile
@@ -14,9 +14,8 @@ BIN = server_loggerd
FILES = Logging_Acceptor \
Logging_Handler
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
BUILD = $(VBIN)
@@ -28,7 +27,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile
index ca30058e8cb..dc3a3b3dd3e 100644
--- a/examples/Mem_Map/IO-tests/Makefile
+++ b/examples/Mem_Map/IO-tests/Makefile
@@ -13,9 +13,8 @@ BIN = test_io
FILES = IO_Test
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
BUILD = $(VBIN)
@@ -27,7 +26,6 @@ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
include $(ACE_ROOT)/include/makeinclude/macros.GNU
include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile
index 1243401db06..bdc62ac9746 100644
--- a/examples/Reactor/Multicast/Makefile
+++ b/examples/Reactor/Multicast/Makefile
@@ -13,9 +13,8 @@ BIN = client server
FILES = Log_Wrapper
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
BUILD = $(VBIN)
diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile
index 716acacc556..a97ca0e3ee2 100644
--- a/examples/Service_Configurator/Misc/Makefile
+++ b/examples/Service_Configurator/Misc/Makefile
@@ -13,9 +13,8 @@ BIN = main
FILES = Timer_Service
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
-SHOBJ = $(addsuffix .so,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
BUILD = $(VBIN)
diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile
index fd75c8e532b..5fff0fc4382 100644
--- a/examples/Shared_Malloc/Makefile
+++ b/examples/Shared_Malloc/Makefile
@@ -1,5 +1,5 @@
#----------------------------------------------------------------------------
-# @(#)Makefile 1.1 10/18/96
+# $Id$
#
# Makefile for tests of the Shared_Malloc wrappers
#----------------------------------------------------------------------------
@@ -15,8 +15,8 @@ BIN = test_malloc \
FILES = Malloc \
Options
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(addsuffix .o,$(FILES))
+SRC = $(addsuffix .cpp,$(FILES))
+OBJ = $(addsuffix .o,$(FILES))
#SHOBJ = $(addsuffix .so,$(FILES))
#LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ))
View Lorry Controller Status