Useless patch?
- From: "Brad P . Crochet" <brad crochet net>
- To: orbit-list gnome org
- Subject: Useless patch?
- Date: Thu, 24 Aug 2000 22:47:47 -0400
Here is some stuff to clean up the versioning in the build files. Maybe this
is what the configure.in is referring to in the comments at the beginning?
Anyway, FWIW, here it is.
Index: ORBit.spec.in
===================================================================
RCS file: /cvs/gnome/ORBit/ORBit.spec.in,v
retrieving revision 1.5
diff -u -r1.5 ORBit.spec.in
--- ORBit.spec.in 2000/02/08 23:26:43 1.5
+++ ORBit.spec.in 2000/08/25 02:42:43
@@ -48,7 +48,7 @@
#MYCFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS $RPM_OPT_FLAGS"
MYCFLAGS="$RPM_OPT_FLAGS"
if [ ! -f configure ]; then
- CFLAGS="$MYCFLAGS" ./autogen.sh --prefix=%prefix
+ CFLAGS="$MYCFLAGS" ./autogen.sh --prefix=%prefix --program-transform-name="s/\(.*\)-\(.*\)/\11-\2/"
else
CFLAGS="$MYCFLAGS" ./configure --prefix=%prefix
fi
Index: configure.in
===================================================================
RCS file: /cvs/gnome/ORBit/configure.in,v
retrieving revision 1.106
diff -u -r1.106 configure.in
--- configure.in 2000/07/24 14:16:14 1.106
+++ configure.in 2000/08/25 02:42:43
@@ -19,8 +19,8 @@
# caveat user :)
ORBIT_MAJOR_VERSION=0
-ORBIT_MINOR_VERSION=5
-ORBIT_MICRO_VERSION=1
+ORBIT_MINOR_VERSION=99
+ORBIT_MICRO_VERSION=0
ORBIT_INTERFACE_AGE=0
ORBIT_BINARY_AGE=0
ORBIT_VERSION=$ORBIT_MAJOR_VERSION.$ORBIT_MINOR_VERSION.$ORBIT_MICRO_VERSION
@@ -30,14 +30,14 @@
AC_SUBST(ORBIT_VERSION)
# libtool versioning
-#LT_RELEASE=$ORBIT_MAJOR_VERSION.$ORBIT_MINOR_VERSION
-#LT_CURRENT=`expr $ORBIT_MICRO_VERSION - $ORBIT_INTERFACE_AGE`
-#LT_REVISION=$ORBIT_INTERFACE_AGE
-#LT_AGE=`expr $ORBIT_BINARY_AGE - $ORBIT_INTERFACE_AGE`
-LT_RELEASE=$ORBIT_VERSION
-LT_CURRENT=$ORBIT_MINOR_VERSION
-LT_REVISION=$ORBIT_MICRO_VERSION
-LT_AGE=$ORBIT_MINOR_VERSION
+LT_RELEASE=$ORBIT_MAJOR_VERSION.$ORBIT_MINOR_VERSION
+LT_CURRENT=`expr $ORBIT_MICRO_VERSION - $ORBIT_INTERFACE_AGE`
+LT_REVISION=$ORBIT_INTERFACE_AGE
+LT_AGE=`expr $ORBIT_BINARY_AGE - $ORBIT_INTERFACE_AGE`
+#LT_RELEASE=$ORBIT_VERSION
+#LT_CURRENT=$ORBIT_MINOR_VERSION
+#LT_REVISION=$ORBIT_MICRO_VERSION
+#LT_AGE=$ORBIT_BINARY_AGE
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
Index: src/IIOP/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/IIOP/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- src/IIOP/Makefile.am 2000/04/05 19:14:27 1.22
+++ src/IIOP/Makefile.am 2000/08/25 02:42:44
@@ -50,7 +50,9 @@
BUILT_SOURCES=$(libwrap_files)
-libIIOP_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libIIOP_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -release $(LT_RELEASE)
EXTRA_DIST = IIOP-design.txt
Index: src/ORBitutil/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/ORBitutil/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- src/ORBitutil/Makefile.am 2000/04/12 08:41:40 1.17
+++ src/ORBitutil/Makefile.am 2000/08/25 02:42:44
@@ -22,4 +22,6 @@
BUILT_SOURCES=orbit-os-config.h
EXTRA_DIST=orbit-os-config.h.in
-libORBitutil_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libORBitutil_la_LDFLAGS = \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -release $(LT_RELEASE)
Index: src/orb/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/Makefile.am,v
retrieving revision 1.55
diff -u -r1.55 Makefile.am
--- src/orb/Makefile.am 2000/08/14 19:12:38 1.55
+++ src/orb/Makefile.am 2000/08/25 02:42:44
@@ -102,7 +102,7 @@
$(IDL):
$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
libORBit_la_LIBADD = $(GLIB_LIBS) -lm
BUILT_SOURCES = \
Index: src/services/name/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/services/name/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- src/services/name/Makefile.am 2000/05/31 09:51:29 1.30
+++ src/services/name/Makefile.am 2000/08/25 02:42:45
@@ -16,7 +16,8 @@
CosNaming.idl
libORBitCosNaming_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -release $(LT_RELEASE)
INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]