summaryrefslogtreecommitdiffstats
path: root/cpukit/librpc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-09 15:48:45 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-09 15:48:45 +0000
commitf670eb767bc2dc8da9844fe6971363aa7f9dc58b (patch)
tree73c595dfa0c0abd9fd4bab3b5ba4cc07eae61175 /cpukit/librpc
parent2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-f670eb767bc2dc8da9844fe6971363aa7f9dc58b.tar.bz2
2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build lib*$(LIB_VARIANT).a instead of $(ARCH)/lib*.a.
Diffstat (limited to 'cpukit/librpc')
-rw-r--r--cpukit/librpc/ChangeLog5
-rw-r--r--cpukit/librpc/Makefile.am32
2 files changed, 20 insertions, 17 deletions
diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog
index 2801a6188b..6e2351dd8f 100644
--- a/cpukit/librpc/ChangeLog
+++ b/cpukit/librpc/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Build lib*$(LIB_VARIANT).a instead of
+ $(ARCH)/lib*.a.
+
2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build library using EXTRA_LIBRARIES and automake rules.
diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am
index 150dedbdeb..f3074ac405 100644
--- a/cpukit/librpc/Makefile.am
+++ b/cpukit/librpc/Makefile.am
@@ -22,16 +22,16 @@ libxdr_C_FILES = src/xdr/xdr.c src/xdr/xdr_array.c src/xdr/xdr_float.c \
src/xdr/xdr_sizeof.c src/xdr/xdr_stdio.c
if LIBRPC
-EXTRA_LIBRARIES = o-optimize/libxdr.a
-o_optimize_libxdr_a_SOURCES = $(libxdr_C_FILES)
-o_optimize_libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+EXTRA_LIBRARIES = libxdr.a
+libxdr_a_SOURCES = $(libxdr_C_FILES)
+libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-EXTRA_LIBRARIES += o-debug/libxdr.a
-o_debug_libxdr_a_SOURCES = $(libxdr_C_FILES)
-o_debug_libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+EXTRA_LIBRARIES += libxdr_g.a
+libxdr_g_a_SOURCES = $(libxdr_C_FILES)
+libxdr_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
man_MANS += src/xdr/xdr.3
-all-local: $(ARCH)/libxdr.a
+all-local: libxdr$(LIB_VARIANT).a
endif
librpc_C_FILES = src/rpc/auth_none.c src/rpc/auth_unix.c \
@@ -54,25 +54,23 @@ librpc_UNUSED_C_FILES = src/rpc/auth_des.c src/rpc/auth_time.c \
src/rpc/svc_unix.c
if LIBRPC
-librpc_a_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \
+librpc_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \
-D_RTEMS_RPC_INTERNAL_
-EXTRA_LIBRARIES += o-optimize/librpc.a
-o_optimize_librpc_a_SOURCES = $(librpc_C_FILES)
-o_optimize_librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
-$(librpc_a_CPPFLAGS)
+EXTRA_LIBRARIES += librpc.a
+librpc_a_SOURCES = $(librpc_C_FILES)
+librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(librpc_CPPFLAGS)
-EXTRA_LIBRARIES += o-debug/librpc.a
-o_debug_librpc_a_SOURCES = $(librpc_C_FILES)
-o_debug_librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
-$(librpc_a_CPPFLAGS)
+EXTRA_LIBRARIES += librpc_g.a
+librpc_g_a_SOURCES = $(librpc_C_FILES)
+librpc_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(librpc_CPPFLAGS)
man_MANS += src/rpc/bindresvport.3 src/rpc/getrpcent.3 src/rpc/publickey.3 \
src/rpc/rpc.3 src/rpc/rpc_secure.3 src/rpc/rstat_svc.8 \
src/rpc/des_crypt.3 src/rpc/getrpcport.3 src/rpc/publickey.5 \
src/rpc/rpc.5 src/rpc/rstat.1 src/rpc/rtime.3
-all-local: $(ARCH)/librpc.a
+all-local: librpc$(LIB_VARIANT).a
endif
EXTRA_DIST = $(librpc_C_FILES) src/rpc/DISCLAIMER $(librpc_UNUSED_C_FILES)