From a9274adb6fcea01b471175e46c569b05d5001fa2 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <mani@lysator.liu.se>
Date: Fri, 30 Dec 2005 17:32:42 +0100
Subject: [PATCH] pike.so -> libpike.so
Rev: Makefile:1.155
Rev: src/Makefile.in:1.413
Rev: src/configure.in:1.932
---
Makefile | 6 +++---
src/Makefile.in | 20 ++++++++++----------
src/configure.in | 12 ++++++------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
index bf3e76cbbd..655427b6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.154 2005/11/07 21:21:36 nilsson Exp $
+# $Id: Makefile,v 1.155 2005/12/30 16:32:42 nilsson Exp $
#
# Meta Makefile
#
@@ -203,8 +203,8 @@ bin/pike: force
pike: bin/pike
@$(DO_MAKE) "METATARGET=pike" _make_in_builddir
-lib: force
- @$(DO_MAKE) "METATARGET=pike.so" _make_in_builddir
+libpike: force
+ @$(DO_MAKE) "METATARGET=libpike.so" _make_in_builddir
install: bin/pike
@$(DO_MAKE) "METATARGET=install" _make_in_builddir
diff --git a/src/Makefile.in b/src/Makefile.in
index 7fd125e8fe..91df357ac5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,11 +1,11 @@
#
-# $Id: Makefile.in,v 1.412 2005/12/04 20:13:58 nilsson Exp $
+# $Id: Makefile.in,v 1.413 2005/12/30 16:32:42 nilsson Exp $
#
# This line is needed on some machines.
@SET_MAKE@
-# Pike embed target, either pike.so or pike.a.
+# Pike embed target, either libpike.so or libpike.a.
PIKE_LIB=@PIKE_LIB@
# Don't change this line. Define EXTRALIBS before this line if you
@@ -263,16 +263,16 @@ compiler-warnings : clean
@echo 'End of summary'
@echo '--------------'
-pike.so: $(OBJ) modules/linker_options post_modules/linker_options
- @echo "Linking pike.so";\
- if $(TMP_BINDIR)/smartlink "$(LDSHARED)" $(LDFLAGS) -o pike.@SO@ \
+libpike.so: $(OBJ) modules/linker_options post_modules/linker_options
+ @echo "Linking libpike.so";\
+ if $(TMP_BINDIR)/smartlink "$(LDSHARED)" $(LDFLAGS) -o libpike.@SO@ \
$(OBJ) `cat modules/linker_options post_modules/linker_options` \
$(LIBS); then \
if test "@SO@" != so ; then mv "module.@SO@" module.so ; \
else :; fi ;\
else \
echo "Linking failed:" >&2; \
- echo $(TMP_BINDIR)/smartlink "$(LDSHARED)" $(LDFLAGS) -o pike.@SO@ \
+ echo $(TMP_BINDIR)/smartlink "$(LDSHARED)" $(LDFLAGS) -o libpike.@SO@ \
$(OBJ) `cat modules/linker_options post_modules/linker_options` \
$(LIBS) >&2 ;\
exit 1; \
@@ -280,10 +280,10 @@ pike.so: $(OBJ) modules/linker_options post_modules/linker_options
# FIXME: Static linked version; this doesn't work yet!
# Since we need to split linker_options into archives and options.
-pike.a: $(OBJ) modules/linker_options post_modules/linker_options
- -rm -f pike.a
- $(AR) cq pike.a $(OBJ)
- -@RANLIB@ pike.a
+libpike.a: $(OBJ) modules/linker_options post_modules/linker_options
+ -rm -f libpike.a
+ $(AR) cq libpike.a $(OBJ)
+ -@RANLIB@ libpike.a
#pike: main.o @DLOPEN_O@ $(PIKE_LIB) master-stamp pike.syms
pike: main.o $(OBJ) master-stamp pike.syms modules/linker_options post_modules/linker_options
diff --git a/src/configure.in b/src/configure.in
index e291ef0f87..4d7c42cd68 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.931 2005/12/06 09:40:11 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.932 2005/12/30 16:32:42 nilsson Exp $")
AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h)
@@ -2334,7 +2334,7 @@ if test "x$PIKE_PATH_TRANSLATE" = "x"; then
# MinGW system.
cat <<\EOF
#!/bin/sh
-# Automatically generated by $Id: configure.in,v 1.931 2005/12/06 09:40:11 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.932 2005/12/30 16:32:42 nilsson Exp $.
# MinGW-version. Do NOT edit.
posix_name="`cat`"
posix_prefix="/"
@@ -2372,7 +2372,7 @@ EOF
# Native POSIX system.
cat <<\EOF
#!/bin/sh
-# Automatically generated by $Id: configure.in,v 1.931 2005/12/06 09:40:11 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.932 2005/12/30 16:32:42 nilsson Exp $.
# POSIX-version. Do NOT edit.
cat
EOF
@@ -2381,7 +2381,7 @@ else
# rntcl-style
cat <<\EOF
#!/bin/sh
-# Automatically generated by $Id: configure.in,v 1.931 2005/12/06 09:40:11 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.932 2005/12/30 16:32:42 nilsson Exp $.
# RNTCL-version. Do NOT edit.
sed -e "$PIKE_PATH_TRANSLATE"
EOF
@@ -7774,10 +7774,10 @@ done
if test x$with_dynamic_modules = xyes ; then
dmmsrc="modules/dynamic_module_makefile.in"
CCSHARED="${CCSHARED} -DDYNAMIC_MODULE"
- PIKE_LIB="pike.so"
+ PIKE_LIB="libpike.so"
else
dmmsrc="modules/static_module_makefile.in"
- PIKE_LIB="pike.a"
+ PIKE_LIB="libpike.a"
fi
AC_SUBST(PIKE_LIB)
--
GitLab