Fri Jul 28 15:58:37 2000 Joe Hoffert <joeh@cs.wustl.edu>

6 files changed, 55 insertions, 85 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c98c7fce94..0e240a6c6c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jul 28 15:58:37 2000  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * bin/pace_components:
+          Deleting from CVS since it is being melded into
+          bin/ace_components.
+
+        * bin/ace_components:
+          Adding commands for pace.
+
+        * include/makeinclude/wrapper_macros.GNU: 
+          For PACE, modified so that it doesn't include the PACE
+          library if we are inlining.
+
 Fri Jul 28 12:46:54 2000  David L. Levine <levine@cs.wustl.edu>
 
         * tests/run_tests.lst: disabled SOCK_Send_Recv_Test,
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5c98c7fce94..0e240a6c6c9 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Fri Jul 28 15:58:37 2000  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * bin/pace_components:
+          Deleting from CVS since it is being melded into
+          bin/ace_components.
+
+        * bin/ace_components:
+          Adding commands for pace.
+
+        * include/makeinclude/wrapper_macros.GNU: 
+          For PACE, modified so that it doesn't include the PACE
+          library if we are inlining.
+
 Fri Jul 28 12:46:54 2000  David L. Levine <levine@cs.wustl.edu>
 
         * tests/run_tests.lst: disabled SOCK_Send_Recv_Test,
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5c98c7fce94..0e240a6c6c9 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Fri Jul 28 15:58:37 2000  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * bin/pace_components:
+          Deleting from CVS since it is being melded into
+          bin/ace_components.
+
+        * bin/ace_components:
+          Adding commands for pace.
+
+        * include/makeinclude/wrapper_macros.GNU: 
+          For PACE, modified so that it doesn't include the PACE
+          library if we are inlining.
+
 Fri Jul 28 12:46:54 2000  David L. Levine <levine@cs.wustl.edu>
 
         * tests/run_tests.lst: disabled SOCK_Send_Recv_Test,
diff --git a/bin/ace_components b/bin/ace_components
index 0d8a1a086a9..86f49381ce5 100755
--- a/bin/ace_components
+++ b/bin/ace_components
@@ -5,11 +5,11 @@
 # components that were built in a library.  Intended to be used by
 # Makefiles and scripts.  See ACE_wrappers/ace/Makefile for an example.
 #
-usage="usage: $0 --ace | --orbsvcs | --tao \
+usage="usage: $0 --ace | --orbsvcs | --tao | --pace \
  [--remove | --set \" <components list> \"]"
 
 ####
-#### Make sure that ACE_ROOT and TAO_ROOT are set.
+#### Make sure that PACE_ROOT, ACE_ROOT, and TAO_ROOT are set.
 ####
 if [ ! "$ACE_ROOT" ]; then
   echo $0': your ACE_ROOT environment variable is not set!' 1>&2
@@ -19,6 +19,10 @@ if [ ! "$TAO_ROOT" ]; then
   TAO_ROOT=$ACE_ROOT/TAO
   export TAO_ROOT
 fi
+if [ ! "$PACE_ROOT" ]; then
+  PACE_ROOT=$ACE_ROOT/PACE
+  export PACE_ROOT
+fi
 
 ####
 #### Process command line arguments.
@@ -29,6 +33,7 @@ if [ $# -ge 1 ]; then
     --orbsvcs)
       components_file=$TAO_ROOT/orbsvcs/orbsvcs/ORBSVCS_COMPONENTS.list ;;
     --tao) components_file=$TAO_ROOT/tao/TAO_COMPONENTS.list ;;
+    --pace) components_file=$PACE_ROOT/PACE_COMPONENTS.list ;;
     *) echo $usage; exit -1 ;;
   esac
   shift
diff --git a/bin/pace_components b/bin/pace_components
deleted file mode 100755
index f399d68415e..00000000000
--- a/bin/pace_components
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# $Id$
-#
-# Encapsulates set/access of a components file, which records set of
-# components that were built in a library.  Intended to be used by
-# Makefiles and scripts.  See ACE_wrappers/PACE/pace/Makefile for an
-# example.
-#
-usage="usage: $0 --pace [--remove | --set \" <components list> \"]"
-
-####
-#### Make sure that PACE_ROOT is set.
-####
-if [ ! "$ACE_ROOT" ]; then
-  echo $0': your ACE_ROOT environment variable is not set!' 1>&2
-  exit -1
-fi
-if [ ! "$PACE_ROOT" ]; then
-  PACE_ROOT=$ACE_ROOT/PACE
-  export PACE_ROOT
-fi
-
-####
-#### Process command line arguments.
-####
-if [ $# -ge 1 ]; then
-  case $1 in
-    --pace) components_file=$PACE_ROOT/PACE_COMPONENTS.list ;;
-    *) echo $usage; exit -1 ;;
-  esac
-  shift
-else
-  echo $usage
-  exit -1
-fi
-
-set_components=0
-if [ $# -ge 1 ]; then
-  if [ $1 = '--set' ]; then
-    set_components=1
-    shift
-    if [ $# -eq 1 ]; then
-      components=$1
-      shift
-    else
-      echo $usage
-      exit -1
-    fi
-  elif [ $1 = '--remove' ]; then
-    rm -f $components_file
-  else
-    echo $usage
-    exit -1
-  fi
-fi
-
-if [ $set_components -eq 1 ]; then
-  ####
-  #### Update the components file, if it has changed since last set.
-  ####
-  if [ -f $components_file ]; then
-    if echo "$components" | diff - $components_file > /dev/null; then
-      :
-    else
-      echo "$components" > $components_file
-    fi
-  else
-    echo "$components" > $components_file
-  fi
-else
-  ####
-  #### Access the contents of the components file, if it exists.
-  ####
-  if [ -f $components_file ]; then
-    cat $components_file
-  fi
-fi
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 42f1bd6c523..04373bc6fe4 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -438,12 +438,15 @@ ifeq ($(pace),0)
 endif # pace
 
 ifneq ($(pace),)
-ifneq ($(inline),0)
-  CFLAGS+= -DPACE_HAS_INLINE=1
-endif
-  CFLAGS+= -DACE_HAS_PACE -DPACE_HAS_ALL_POSIX_FUNCS -I$(ACE_ROOT)/PACE
-  LDFLAGS+= -L$(ACE_ROOT)/PACE/pace/
-  ACELIB=-lACE -lPACE
+  ifneq ($(inline),0)
+    CFLAGS += -DPACE_HAS_INLINE=1
+  endif
+  CFLAGS += -DACE_HAS_PACE -DPACE_HAS_ALL_POSIX_FUNCS -I$(ACE_ROOT)/PACE
+  ACELIB = -lACE
+  ifeq ($(inline),0)
+    ACELIB += -lPACE
+    LDFLAGS += -L$(ACE_ROOT)/PACE/pace/
+  endif # inline == 0
   include $(ACE_ROOT)/PACE/include/makeinclude/rules.common.GNU
 endif # pace