Tue Sep 26 15:19:20 2000 Joe Hoffert <joeh@cs.wustl.edu>

4 files changed, 49 insertions, 37 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index 7eae30f90aa..2e4190d38ed 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,15 @@
+Tue Sep 26 15:19:20 2000  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * tests/Makefile:
+        * pace/Makefile:
+          Moved checks for inlining flags down in the file so
+          that include/makeinclude/platform_macros.GNU can be
+          checked to see if the flags are set there.
+
+        * pace/posix/stdio.h:
+          Moved stdio.h header file include after stdarg.h
+          header file (per comment in ace/OS.h file)
+
 Fri Sep 22 11:32:25 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * PACE/pace/posix/math.inl:
diff --git a/PACE/pace/Makefile b/PACE/pace/Makefile
index b871361105b..87a5509f7ff 100644
--- a/PACE/pace/Makefile
+++ b/PACE/pace/Makefile
@@ -4,22 +4,6 @@
 #       Makefile for the PACE/pace C library release
 #----------------------------------------------------------------------------
 
-ifndef static_libs_only
-  ifndef shared_libs_only
-    static_libs_only = 1
-  endif # ! shared_libs_only
-endif # ! static_libs_only
-
-# If we are inlining the PACE functions then we need to define
-# PACE_HAS_INLINE. Inlining is the default.
-ifndef inline
-  CFLAGS += -DPACE_HAS_INLINE
-endif # ! inline
-
-ifeq (1,$(inline))
-  CFLAGS += -DPACE_HAS_INLINE
-endif # inline
-
 MAKEFILE = Makefile
 LIB      = libPACE.a
 SHLIB    = libPACE.$(SOEXT)
@@ -428,6 +412,22 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 include $(ACE_ROOT)/PACE/include/makeinclude/rules.common.GNU
 
+ifndef static_libs_only
+  ifndef shared_libs_only
+    static_libs_only = 1
+  endif # ! shared_libs_only
+endif # ! static_libs_only
+
+# If we are inlining the PACE functions then we need to define
+# PACE_HAS_INLINE. Inlining is the default.
+ifndef inline
+  CFLAGS += -DPACE_HAS_INLINE
+endif # ! inline
+
+ifeq (1,$(inline))
+  CFLAGS += -DPACE_HAS_INLINE
+endif # inline
+
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
diff --git a/PACE/pace/posix/stdio.h b/PACE/pace/posix/stdio.h
index bee28898ca0..901476acd75 100644
--- a/PACE/pace/posix/stdio.h
+++ b/PACE/pace/posix/stdio.h
@@ -16,8 +16,8 @@
 #ifndef PACE_STDIO_H_POSIX
 #define PACE_STDIO_H_POSIX
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 
 #if defined (PACE_HAS_CPLUSPLUS)
 extern "C" {
diff --git a/PACE/tests/Makefile b/PACE/tests/Makefile
index 65d3795d0ab..bc8f3bc76d7 100644
--- a/PACE/tests/Makefile
+++ b/PACE/tests/Makefile
@@ -5,26 +5,6 @@
 #       Makefile for all the PACE tests
 #----------------------------------------------------------------------------
 
-ifndef static_libs_only
-  ifndef shared_libs_only
-    static_libs_only = 1
-  endif # shared_libs_only
-endif # static_libs_only
-
-# If we are inlining the PACE functions then we don't want to include
-# the PACE library (and we need to define PACE_HAS_INLINE). If we're not
-# inlining then we need to include the PACE library. Inlining is the default.
-
-ifndef inline
-  CFLAGS += -DPACE_HAS_INLINE
-else
-  ifneq (0,$(inline))
-    CFLAGS += -DPACE_HAS_INLINE
-  else
-    LIBS += -L$(ACE_ROOT)/PACE/pace -lPACE
-  endif # ! inline
-endif # ! inline
-
 CFLAGS += -DPACE_HAS_ALL_POSIX_FUNCS
 
 #----------------------------------------------------------------------------
@@ -61,6 +41,26 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 include $(ACE_ROOT)/PACE/include/makeinclude/rules.common.GNU
 
+ifndef static_libs_only
+  ifndef shared_libs_only
+    static_libs_only = 1
+  endif # shared_libs_only
+endif # static_libs_only
+
+# If we are inlining the PACE functions then we don't want to include
+# the PACE library (and we need to define PACE_HAS_INLINE). If we're not
+# inlining then we need to include the PACE library. Inlining is the default.
+
+ifndef inline
+  CFLAGS += -DPACE_HAS_INLINE
+else
+  ifneq (0,$(inline))
+    CFLAGS += -DPACE_HAS_INLINE
+  else
+    LIBS += -L$(ACE_ROOT)/PACE/pace -lPACE
+  endif # ! inline
+endif # ! inline
+
 # To compile in the PACE lib on platforms that compile c code
 ifeq  (1, $(emulation))
   LIBS += -L$(PACE_ROOT)/pace -lPACE