updated parallel install patches, including ORBit1 patches

From: Havoc Pennington <hp redhat com>
To: orbit-list gnome org
Subject: updated parallel install patches, including ORBit1 patches
Date: 12 Sep 2001 14:26:18 -0400


Hi,

I changed the ORBit2 patch a bit and also hacked ORBit 1. Here is the
result, also file lists from the resulting -devel RPMs for quick reference.

Havoc

/usr/bin/libIDL-config
/usr/bin/orbit-config
/usr/bin/orbit-idl
/usr/include/libIDL-1.0
/usr/include/libIDL-1.0/libIDL
/usr/include/libIDL-1.0/libIDL/IDL.h
/usr/include/orbit-1.0
/usr/include/orbit-1.0/IIOP
/usr/include/orbit-1.0/IIOP/IIOP-config.h
/usr/include/orbit-1.0/IIOP/IIOP-types.h
/usr/include/orbit-1.0/IIOP/IIOP.h
/usr/include/orbit-1.0/IIOP/giop-msg-buffer.h
/usr/include/orbit-1.0/IIOP/iiop-encoders.h
/usr/include/orbit-1.0/IIOP/iiop-endian.h
/usr/include/orbit-1.0/ORBitservices
/usr/include/orbit-1.0/ORBitservices/CosEventChannel.idl
/usr/include/orbit-1.0/ORBitservices/CosEventComm.idl
/usr/include/orbit-1.0/ORBitservices/CosNaming.h
/usr/include/orbit-1.0/ORBitservices/CosNaming.idl
/usr/include/orbit-1.0/ORBitservices/CosNaming_impl.h
/usr/include/orbit-1.0/ORBitservices/CosTypedEventChannel.idl
/usr/include/orbit-1.0/ORBitservices/CosTypedEventComm.idl
/usr/include/orbit-1.0/ORBitservices/LName.pidl
/usr/include/orbit-1.0/ORBitutil
/usr/include/orbit-1.0/ORBitutil/basic_types.h
/usr/include/orbit-1.0/ORBitutil/compat.h
/usr/include/orbit-1.0/ORBitutil/orbit-os-config.h
/usr/include/orbit-1.0/ORBitutil/os-feature-alloca.h
/usr/include/orbit-1.0/ORBitutil/os-specifics.h
/usr/include/orbit-1.0/ORBitutil/thread-safety.h
/usr/include/orbit-1.0/ORBitutil/trace.h
/usr/include/orbit-1.0/ORBitutil/util.h
/usr/include/orbit-1.0/orb
/usr/include/orbit-1.0/orb/allocator-defs.h
/usr/include/orbit-1.0/orb/allocators.h
/usr/include/orbit-1.0/orb/cdr.h
/usr/include/orbit-1.0/orb/corba_any.h
/usr/include/orbit-1.0/orb/corba_any_proto.h
/usr/include/orbit-1.0/orb/corba_any_type.h
/usr/include/orbit-1.0/orb/corba_basic_sequences_type.h
/usr/include/orbit-1.0/orb/corba_context.h
/usr/include/orbit-1.0/orb/corba_env.h
/usr/include/orbit-1.0/orb/corba_env_type.h
/usr/include/orbit-1.0/orb/corba_object.h
/usr/include/orbit-1.0/orb/corba_object_type.h
/usr/include/orbit-1.0/orb/corba_orb.h
/usr/include/orbit-1.0/orb/corba_orb_type.h
/usr/include/orbit-1.0/orb/corba_portableserver.h
/usr/include/orbit-1.0/orb/corba_portableserver_type.h
/usr/include/orbit-1.0/orb/corba_sequences.h
/usr/include/orbit-1.0/orb/corba_sequences_type.h
/usr/include/orbit-1.0/orb/corba_typecode.h
/usr/include/orbit-1.0/orb/corba_typecode_type.h
/usr/include/orbit-1.0/orb/dii.h
/usr/include/orbit-1.0/orb/dynany.h
/usr/include/orbit-1.0/orb/env.h
/usr/include/orbit-1.0/orb/interface_repository.h
/usr/include/orbit-1.0/orb/iop.h
/usr/include/orbit-1.0/orb/ir.h
/usr/include/orbit-1.0/orb/options.h
/usr/include/orbit-1.0/orb/orb.h
/usr/include/orbit-1.0/orb/orbit.h
/usr/include/orbit-1.0/orb/orbit_config.h
/usr/include/orbit-1.0/orb/orbit_object.h
/usr/include/orbit-1.0/orb/orbit_object_type.h
/usr/include/orbit-1.0/orb/orbit_poa.h
/usr/include/orbit-1.0/orb/orbit_poa_type.h
/usr/include/orbit-1.0/orb/orbit_typecode.h
/usr/include/orbit-1.0/orb/orbit_types.h
/usr/include/orbit-1.0/orb/poa.h
/usr/include/orbit-1.0/orb/sequences.h
/usr/include/orbit-1.0/orb/typecode.h
/usr/include/orbit-1.0/orbit-idl2.h
/usr/lib/libIDL.a
/usr/lib/libIDL.so
/usr/lib/libIDLConf.sh
/usr/lib/libIIOP.a
/usr/lib/libIIOP.so
/usr/lib/libORBit.a
/usr/lib/libORBit.so
/usr/lib/libORBitCosNaming.a
/usr/lib/libORBitCosNaming.so
/usr/lib/libORBitutil.a
/usr/lib/libORBitutil.so
/usr/lib/libname-server.a
/usr/lib/liborbit-c-backend.a
/usr/share/aclocal/ORBit.m4
/usr/share/aclocal/libIDL.m4
/usr/share/info/libIDL.info.gz

/usr/bin/ior-decode-2
/usr/bin/libIDL-config-2
/usr/bin/orbit-idl-2
/usr/bin/orbit2-config
/usr/bin/typelib-dump
/usr/include/libIDL-2.0
/usr/include/libIDL-2.0/libIDL
/usr/include/libIDL-2.0/libIDL/IDL.h
/usr/include/orbit-2.0
/usr/include/orbit-2.0/ORBitservices
/usr/include/orbit-2.0/ORBitservices/CosNaming.h
/usr/include/orbit-2.0/ORBitservices/CosNaming.idl
/usr/include/orbit-2.0/ORBitservices/CosNaming_impl.h
/usr/include/orbit-2.0/orbit
/usr/include/orbit-2.0/orbit-idl2.h
/usr/include/orbit-2.0/orbit/GIOP
/usr/include/orbit-2.0/orbit/GIOP/giop-basics.h
/usr/include/orbit-2.0/orbit/GIOP/giop-connection.h
/usr/include/orbit-2.0/orbit/GIOP/giop-endian.h
/usr/include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h
/usr/include/orbit-2.0/orbit/GIOP/giop-send-buffer.h
/usr/include/orbit-2.0/orbit/GIOP/giop-server.h
/usr/include/orbit-2.0/orbit/GIOP/giop-types.h
/usr/include/orbit-2.0/orbit/GIOP/giop.h
/usr/include/orbit-2.0/orbit/dynamic
/usr/include/orbit-2.0/orbit/dynamic/dynamic-defs.h
/usr/include/orbit-2.0/orbit/dynamic/dynamic.h
/usr/include/orbit-2.0/orbit/orb-core
/usr/include/orbit-2.0/orbit/orb-core/allocators.h
/usr/include/orbit-2.0/orbit/orb-core/corba-any-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-any.h
/usr/include/orbit-2.0/orbit/orb-core/corba-context-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-context.h
/usr/include/orbit-2.0/orbit/orb-core/corba-defs.h
/usr/include/orbit-2.0/orbit/orb-core/corba-environment-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-environment.h
/usr/include/orbit-2.0/orbit/orb-core/corba-ir.h
/usr/include/orbit-2.0/orbit/orb-core/corba-nvlist-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-nvlist.h
/usr/include/orbit-2.0/orbit/orb-core/corba-object-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-object.h
/usr/include/orbit-2.0/orbit/orb-core/corba-orb-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-orb.h
/usr/include/orbit-2.0/orbit/orb-core/corba-pobj.h
/usr/include/orbit-2.0/orbit/orb-core/corba-policy-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-string.h
/usr/include/orbit-2.0/orbit/orb-core/corba-typecode-type.h
/usr/include/orbit-2.0/orbit/orb-core/corba-typecode.h
/usr/include/orbit-2.0/orbit/orb-core/iop-defs.h
/usr/include/orbit-2.0/orbit/orb-core/orb-core-types.h
/usr/include/orbit-2.0/orbit/orb-core/orb-core.h
/usr/include/orbit-2.0/orbit/orb-core/orb-defs.h
/usr/include/orbit-2.0/orbit/orb-core/orb-types.h
/usr/include/orbit-2.0/orbit/orb-core/orbit-interface.h
/usr/include/orbit-2.0/orbit/orb-core/orbit-object.h
/usr/include/orbit-2.0/orbit/orb-core/orbit-small.h
/usr/include/orbit-2.0/orbit/orbit-config.h
/usr/include/orbit-2.0/orbit/orbit-types.h
/usr/include/orbit-2.0/orbit/orbit.h
/usr/include/orbit-2.0/orbit/poa
/usr/include/orbit-2.0/orbit/poa/orbit-adaptor.h
/usr/include/orbit-2.0/orbit/poa/poa-basics.h
/usr/include/orbit-2.0/orbit/poa/poa-defs.h
/usr/include/orbit-2.0/orbit/poa/poa-policy.h
/usr/include/orbit-2.0/orbit/poa/poa-types.h
/usr/include/orbit-2.0/orbit/poa/poa.h
/usr/include/orbit-2.0/orbit/poa/portableserver-current-type.h
/usr/include/orbit-2.0/orbit/poa/portableserver-poa-type.h
/usr/include/orbit-2.0/orbit/util
/usr/include/orbit-2.0/orbit/util/basic_types.h
/usr/include/orbit-2.0/orbit/util/orbit-genrand.h
/usr/include/orbit-2.0/orbit/util/orbit-util.h
/usr/include/orbit-2.0/orbit/util/os-feature-alloca.h
/usr/include/orbit-2.0/orbit/util/thread-safety.h
/usr/lib/libIDL-2.a
/usr/lib/libIDL-2.so
/usr/lib/libORBit-2.a
/usr/lib/libORBit-2.so
/usr/lib/libORBitCosNaming-2.a
/usr/lib/libORBitCosNaming-2.so
/usr/lib/libname-server-2.a
/usr/lib/pkgconfig/ORBit-2.0.pc
/usr/lib/pkgconfig/ORBit-CosNaming-2.0.pc
/usr/lib/pkgconfig/libIDL-2.0.pc
/usr/share/aclocal/ORBit2.m4
/usr/share/info/libIDL2.info.gz

Index: orbit-config.in
===================================================================
RCS file: /cvs/gnome/ORBit/orbit-config.in,v
retrieving revision 1.7.4.1
diff -u -p -u -r1.7.4.1 orbit-config.in
--- orbit-config.in	2001/09/07 17:55:03	1.7.4.1
+++ orbit-config.in	2001/09/12 17:03:56
@@ -3,7 +3,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
-includedir=@includedir@
+includedir=@includedir@/orbit-1.0
 libdir=@libdir@
 
 usage()
Index: libIDL/Makefile.am
===================================================================
RCS file: /cvs/gnome/libIDL/Makefile.am,v
retrieving revision 1.65.4.3
diff -u -p -u -r1.65.4.3 Makefile.am
--- libIDL/Makefile.am	2000/09/30 02:09:43	1.65.4.3
+++ libIDL/Makefile.am	2001/09/12 17:03:56
@@ -36,7 +36,8 @@ EXTRA_DIST		= BUGS parser.y lexer.l \
 			  libIDL.pc.in
 
 info_TEXINFOS		= libIDL.texi
-pkginclude_HEADERS	= IDL.h
+libidlincludedir        = $(includedir)/libIDL-1.0/libIDL
+libidlinclude_HEADERS	= IDL.h
 lib_LTLIBRARIES		= libIDL.la
 noinst_PROGRAMS		= tstidl
 
Index: libIDL/libIDL-config.in
===================================================================
RCS file: /cvs/gnome/libIDL/libIDL-config.in,v
retrieving revision 1.3
diff -u -p -u -r1.3 libIDL-config.in
--- libIDL/libIDL-config.in	1999/04/16 14:52:20	1.3
+++ libIDL/libIDL-config.in	2001/09/12 17:03:56
@@ -50,9 +50,7 @@ while test $# -gt 0; do
       exit 0
       ;;
     --cflags)
-      if test "@includedir@" != /usr/include ; then
-        includes="-I@includedir@"
-      fi
+      includes="-I@includedir@/libIDL-1.0"
       echo_cflags=yes
       ;;
     --libs)
Index: src/IIOP/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/IIOP/Makefile.am,v
retrieving revision 1.21.4.1
diff -u -p -u -r1.21.4.1 Makefile.am
--- src/IIOP/Makefile.am	2000/04/05 19:14:44	1.21.4.1
+++ src/IIOP/Makefile.am	2001/09/12 17:03:56
@@ -8,13 +8,11 @@ libwrap_files=
 libwrap_deps=$(LIB_WRAP)
 endif
 
-libIIOPincludedir = $(includedir)/ORBit/IIOP
-
 INCLUDES=-I.. -I$(top_srcdir)/src @GLIB_CFLAGS@ -I$(top_builddir)/src/ORBitutil
 
 lib_LTLIBRARIES=libIIOP.la
 
-libIIOPincludedir = $(includedir)/IIOP
+libIIOPincludedir = $(includedir)/orbit-1.0/IIOP
 
 libIIOP_la_SOURCES= \
 	connection.c \
Index: src/ORBitutil/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/ORBitutil/Makefile.am,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.am
--- src/ORBitutil/Makefile.am	1999/11/13 17:09:59	1.16
+++ src/ORBitutil/Makefile.am	2001/09/12 17:03:56
@@ -2,7 +2,7 @@ INCLUDES=-I$(top_builddir)/src -I$(top_s
 
 lib_LTLIBRARIES=libORBitutil.la
 
-libORBitutilincludedir = $(includedir)/ORBitutil
+libORBitutilincludedir = $(includedir)/orbit-1.0/ORBitutil
 
 libORBitutil_la_SOURCES = \
 	trace.c \
Index: src/orb/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/orb/Makefile.am,v
retrieving revision 1.49.4.3
diff -u -p -u -r1.49.4.3 Makefile.am
--- src/orb/Makefile.am	2001/09/11 22:25:38	1.49.4.3
+++ src/orb/Makefile.am	2001/09/12 17:03:56
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-libORBitincludedir = $(includedir)/ORBit
-
 INCLUDES =-I.. -I$(top_srcdir)/src @GLIB_CFLAGS@ \
 	-DORBit_SYSRC=\"$(sysconfdir)/orbitrc\" \
 	-I$(top_builddir)/src/ORBitutil \
@@ -13,7 +11,7 @@ INCLUDES =-I.. -I$(top_srcdir)/src @GLIB
 
 lib_LTLIBRARIES = libORBit.la
 
-libORBitincludedir = $(includedir)/orb
+libORBitincludedir = $(includedir)/orbit-1.0/orb
 
 EXTRA_DIST=orbit.h.in
 
Index: src/orbit-idl-compiler/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/orbit-idl-compiler/Makefile.am,v
retrieving revision 1.13.4.2
diff -u -p -u -r1.13.4.2 Makefile.am
--- src/orbit-idl-compiler/Makefile.am	2000/07/14 14:38:35	1.13.4.2
+++ src/orbit-idl-compiler/Makefile.am	2001/09/12 17:03:56
@@ -1,7 +1,7 @@
 SUBDIRS=backends
 bin_PROGRAMS=orbit-idl
 
-includedir=$(prefix)/include
+orbitidlincludedir=$(includedir)/orbit-1.0
 orbitlibdir=$(libdir)/orbit-idl
 
 INCLUDES=-I$(top_builddir) -I$(top_builddir)/src \
@@ -28,7 +28,7 @@ orbit_idl_SOURCES=orbit-idl-main.c \
 		   orbit-idl-genmarshal.c \
 		   orbit-idl-utils.c \
 		   orbit-idl2.h
-include_DATA=orbit-idl2.h
+orbitidlinclude_HEADERS=orbit-idl2.h
 
 $(top_builddir)/libIDL/libIDL.la:
 	$(MAKE) -C $(top_builddir)/libIDL libIDL.la
Index: src/services/event/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/services/event/Makefile.am,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile.am
--- src/services/event/Makefile.am	2000/01/24 20:05:51	1.15
+++ src/services/event/Makefile.am	2001/09/12 17:03:56
@@ -1,4 +1,4 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-1.0/ORBitservices
 
 libORBitservicesinclude_HEADERS =  					\
 	CosEventComm.idl						\
Index: src/services/name/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/services/name/Makefile.am,v
retrieving revision 1.29
diff -u -p -u -r1.29 Makefile.am
--- src/services/name/Makefile.am	2000/01/24 20:05:51	1.29
+++ src/services/name/Makefile.am	2001/09/12 17:03:56
@@ -1,4 +1,4 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-1.0/ORBitservices
 
 lib_LTLIBRARIES=libORBitCosNaming.la
 
Index: src/services/time/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit/src/services/time/Makefile.am,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.am
--- src/services/time/Makefile.am	1999/06/24 15:16:00	1.4
+++ src/services/time/Makefile.am	2001/09/12 17:03:56
@@ -1,4 +1,4 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-1.0/ORBitservices
 
 libORBitservicesinclude_HEADERS =  					\
 	CosTime.idl \

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/ChangeLog,v
retrieving revision 1.170
diff -u -p -u -r1.170 ChangeLog
--- ChangeLog	2001/09/11 13:28:57	1.170
+++ ChangeLog	2001/09/12 17:03:38
@@ -1,3 +1,32 @@
+2001-09-11  Havoc Pennington  <hp@redhat.com>
+
+	* src/idl-compiler/Makefile.am: put orbit-idl2.h in
+	includedir/orbit-idl-2.0/orbit-idl2.h
+	
+	* test/Makefile.am (ior_decode_2_SOURCES): rename ior-decode to
+	ior-decode-2
+
+	* src/services/name/Makefile.am (libORBitservicesincludedir): put 
+	ORBitservices inside /usr/include/orbit to avoid ORBit1 conflicts
+	(lib_LIBRARIES): rename libname-server to libname-server-2
+
+	* src/orb/poa/Makefile.am (IDL): s/orbit-idl/orbit-idl-2/
+
+	* src/orb/orb-core/Makefile.am: s/orbit-idl/orbit-idl-2/
+
+	* Makefile.shared (IDL_COMPILER): s/orbit-idl/orbit-idl-2/
+
+	* src/idl-compiler/Makefile.am: s/orbit-idl/orbit-idl-2/
+
+	* src/services/name/Makefile.am: s/name-client/name-client-2/
+	s/orbit-name-server/orbit-name-server-2/
+
+	* src/orb/poa/Makefile.am (IDL_DIR): add IDL_DIR=./ to disable the 
+	implicit rule in Makefile.shared for IDL files in other
+	directories, because for some reason corba-ops.idl was getting
+	rebuilt, with the wrong IDL_FLAGS from this Makefile, thus
+	corba-ops.h ended up not existing. This is just a bad hack.
+
 2001-09-11  Mark McLoughlin <mark@skynet.ie>
 
 	* src/orb/orb-core/iop-profiles.c
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/Makefile.am,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile.am
--- Makefile.am	2001/06/19 15:01:20	1.8
+++ Makefile.am	2001/09/12 17:03:38
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.3
 
 SUBDIRS=libIDL src include test docs
 
-bin_SCRIPTS=orbit-config
+bin_SCRIPTS=orbit2-config
 
 EXTRA_DIST=ORBit.spec.in ORBit2.m4 ORBit-2.0.pc.in ORBit-CosNaming-2.0.pc.in
 
@@ -17,3 +17,6 @@ m4data_DATA=ORBit2.m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ORBit-2.0.pc ORBit-CosNaming-2.0.pc
+
+orbit2-config: orbit-config
+	cp -f orbit-config orbit2-config
\ No newline at end of file
Index: Makefile.shared
===================================================================
RCS file: /cvs/gnome/ORBit2/Makefile.shared,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.shared
--- Makefile.shared	2001/09/04 09:00:58	1.3
+++ Makefile.shared	2001/09/12 17:03:38
@@ -1,4 +1,4 @@
-IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl
+IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl-2
 
 %.h %-stubs.c %-skels.c %-common.c %-imodule.c %-skelimpl.c: $(IDL_DIR)%.idl $(IDL_COMPILER)
 	-(rm -f $(*).h $(*)-stubs.c $(*)-skels.c $(*)-common.c $(*)-imodule.c $(*)-skelimpl.c || true) > /dev/null
Index: ORBit-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/ORBit2/ORBit-2.0.pc.in,v
retrieving revision 1.6
diff -u -p -u -r1.6 ORBit-2.0.pc.in
--- ORBit-2.0.pc.in	2001/08/27 12:20:11	1.6
+++ ORBit-2.0.pc.in	2001/09/12 17:03:38
@@ -10,4 +10,4 @@ Description: High-performance CORBA Obje
 Version: @VERSION@
 Requires: glib-2.0 gmodule-2.0
 Libs: -L${libdir} -lORBit-2 @LINC_LIBS@ @LIBS@ -lm
-Cflags: -I${includedir} -DORBIT2=1
+Cflags: -I${includedir} -I${includedir}/orbit-idl-2.0 -DORBIT2=1
Index: include/orbit/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- include/orbit/Makefile.am	2000/11/07 01:18:42	1.5
+++ include/orbit/Makefile.am	2001/09/12 17:03:38
@@ -1,6 +1,6 @@
 SUBDIRS=GIOP util orb-core poa dynamic
 
-orbitincludedir=$(includedir)/orbit
+orbitincludedir=$(includedir)/orbit-2.0/orbit
 orbitinclude_HEADERS=orbit.h orbit-config.h orbit-types.h
 
 BUILT_SOURCES=orbit-config.h
Index: include/orbit/GIOP/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/GIOP/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- include/orbit/GIOP/Makefile.am	2000/11/07 01:18:42	1.6
+++ include/orbit/GIOP/Makefile.am	2001/09/12 17:03:38
@@ -1,4 +1,4 @@
-GIOPincludedir=$(includedir)/orbit/GIOP
+GIOPincludedir=$(includedir)/orbit-2.0/orbit/GIOP
 
 GIOPinclude_HEADERS= \
 	giop-endian.h \
Index: include/orbit/dynamic/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/dynamic/Makefile.am,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.am
--- include/orbit/dynamic/Makefile.am	2001/08/15 07:14:05	1.3
+++ include/orbit/dynamic/Makefile.am	2001/09/12 17:03:38
@@ -1,4 +1,4 @@
-dynamicincludedir=$(includedir)/orbit/dynamic
+dynamicincludedir=$(includedir)/orbit-2.0/orbit/dynamic
 dynamicinclude_HEADERS= \
 	dynamic.h	\
 	dynamic-defs.h
Index: include/orbit/orb-core/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/orb-core/Makefile.am,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile.am
--- include/orbit/orb-core/Makefile.am	2001/08/15 07:14:06	1.9
+++ include/orbit/orb-core/Makefile.am	2001/09/12 17:03:38
@@ -1,4 +1,4 @@
-orbcoreincludedir=$(includedir)/orbit/orb-core
+orbcoreincludedir=$(includedir)/orbit-2.0/orbit/orb-core
 orbcoreinclude_HEADERS= \
 	corba-environment-type.h	\
 	corba-ir.h			\
Index: include/orbit/poa/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/poa/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- include/orbit/poa/Makefile.am	2001/08/24 18:56:45	1.6
+++ include/orbit/poa/Makefile.am	2001/09/12 17:03:38
@@ -1,4 +1,4 @@
-poaincludedir=$(includedir)/orbit/poa
+poaincludedir=$(includedir)/orbit-2.0/orbit/poa
 poainclude_HEADERS= \
 	poa-types.h	\
 	poa.h		\
Index: include/orbit/util/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/util/Makefile.am,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.am
--- include/orbit/util/Makefile.am	2000/11/07 01:18:44	1.4
+++ include/orbit/util/Makefile.am	2001/09/12 17:03:38
@@ -1,4 +1,4 @@
-utilincludedir=$(includedir)/orbit/util
+utilincludedir=$(includedir)/orbit-2.0/orbit/util
 
 utilinclude_HEADERS= \
 	basic_types.h \
Index: libIDL/ChangeLog
===================================================================
RCS file: /cvs/gnome/libIDL/ChangeLog,v
retrieving revision 1.119
diff -u -p -u -r1.119 ChangeLog
--- libIDL/ChangeLog	2001/09/03 15:40:41	1.119
+++ libIDL/ChangeLog	2001/09/12 17:03:39
@@ -1,3 +1,12 @@
+2001-09-11  Havoc Pennington  <hp@redhat.com>
+
+	* Makefile.am (libIDLincludedir): move headers to a versioned
+	subdir, and nuke libIDLConf.sh. rename libIDL-config to
+	libIDL-config-2
+
+	* libIDL-2.0.pc.in (Cflags): change -Iincludedir to
+	-Iincludedir/libIDL-2.0
+
 2001-09-03  Mark McLoughlin <mark@skynet.ie>
 
 	Fixes Bug #59824: the time to parse a union seemed to grow 
Index: libIDL/Makefile.am
===================================================================
RCS file: /cvs/gnome/libIDL/Makefile.am,v
retrieving revision 1.68
diff -u -p -u -r1.68 Makefile.am
--- libIDL/Makefile.am	2001/08/31 02:42:51	1.68
+++ libIDL/Makefile.am	2001/09/12 17:03:39
@@ -30,15 +30,16 @@ DISTCLEANFILES		= IDL.h
 
 EXTRA_DIST		= BUGS parser.y lexer.l \
 			  Makefile.msc README.win32 \
-			  libIDL.def libIDLConf.sh.in \
+			  libIDL.def \
 			  stamp-parser
 
-info_TEXINFOS		= libIDL.texi
-pkginclude_HEADERS	= IDL.h
+info_TEXINFOS		= libIDL2.texi
+libIDLincludedir        = $(includedir)/libIDL-2.0/libIDL
+libIDLinclude_HEADERS   = IDL.h
 lib_LTLIBRARIES		= libIDL-2.la
 noinst_PROGRAMS		= tstidl
 
-bin_SCRIPTS		= libIDL-config
+bin_SCRIPTS		= libIDL-config-2
 
 BUILT_SOURCES		= lexer.c parser.c parser.h IDL.h stamp-parser
 
@@ -50,23 +51,8 @@ libIDL_2_la_LDFLAGS	= -version-info $(LT
 tstidl_SOURCES		= tstidl.c
 tstidl_LDADD		= libIDL-2.la @GLIB_LIBS@
 
-confexecdir		= $(libdir)
-confexec_DATA		= libIDLConf.sh
-
-## We create libIDLConf.sh here and not from configure because we want
-## to get the paths expanded correctly.  Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-
-libIDLConf.sh: libIDLConf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\@LIBIDL_LIBDIR\@?$(LIBIDL_LIBDIR)?g' \
-		-e 's?\@LIBIDL_INCLUDEDIR\@?$(LIBIDL_INCLUDEDIR)?g' \
-		-e 's?\@LIBIDL_LIBS\@?$(LIBIDL_LIBS)?g' \
-		-e 's?\@VERSION\@?$(VERSION)?g' \
-		< $(srcdir)/libIDLConf.sh.in > libIDLConf.tmp \
-		&& mv libIDLConf.tmp libIDLConf.sh
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= libIDL-2.0.pc
 
+libIDL-config-2: libIDL-config
+	cp -f libIDL-config libIDL-config-2
Index: libIDL/libIDL-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/libIDL/libIDL-2.0.pc.in,v
retrieving revision 1.1
diff -u -p -u -r1.1 libIDL-2.0.pc.in
--- libIDL/libIDL-2.0.pc.in	2001/06/23 13:29:48	1.1
+++ libIDL/libIDL-2.0.pc.in	2001/09/12 17:03:39
@@ -9,4 +9,4 @@ Description: IDL parsing library
 Version: @VERSION@
 Requires: glib-2.0
 Libs: -L${libdir} -lIDL-2
-Cflags: -I${includedir}
+Cflags: -I${includedir}/libIDL-2.0
Index: libIDL/libIDL.texi
===================================================================
RCS file: libIDL.texi
diff -N libIDL.texi
--- /tmp/cvsIZPUZp	Wed Sep 12 13:03:45 2001
+++ /dev/null	Tue May  5 16:32:27 1998
@@ -1,359 +0,0 @@
-\input texinfo @c -*- mode: texinfo -*-
-@setfilename libIDL.info
-@settitle libIDL
-@setchapternewpage odd
-
-@ifinfo
-@dircategory Libraries
-@direntry
-* libIDL: (libIDL).     Interface Definition Language parsing library.
-@end direntry
-
-Copyright 1998 Andrew T. Veliath
-@end ifinfo
-
-@titlepage
-@title libIDL
-@author Andrew T. Veliath
-
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1998, 1999 Andrew T. Veliath
-@end titlepage
-
-@node Top, , , (dir)
-@ifinfo
-This file documents the Interface Definition Language (IDL) parsing
-library, libIDL.
-
-This document applies to version 0.6 of libIDL.  It is still incomplete.
-@end ifinfo
-
-@menu
-* Overview::                  General overview.
-* Example::                   Simple example.
-* Reference::                 Data structure and function reference.
-
-* Function Index::            Index of available functions.
-@end menu
-
-@node Overview, Example, top, top
-@chapter Overview
-libIDL is a library licensed under the GNU LGPL for creating trees of
-CORBA Interface Definition Language (IDL) files, which is a
-specification for defining portable interfaces.  libIDL was initially
-written for ORBit (the ORB from the GNOME project, and the primary
-means of libIDL distribution).  However, the functionality was
-designed to be as reusable and portable as possible.
-
-It is written in C, and the aim is to retain the ability to compile it
-on a system with a standard C compiler.  Preprocessed parser files are
-included so you are not forced to rebuild the parser, however an
-effort is made to keep the parser and lexer compatible with standard
-Unix yacc and lex (although bison and flex are more efficient, and are
-used for the preprocessed parsers in the distribution).
-
-With libIDL, you can parse an IDL file which will be automatically run
-through the C preprocessor (on systems with one available), and have
-detailed error and warning messages displayed.  On a compilation
-without errors, the tree is returned to the custom application.
-libIDL performs compilation phases from lexical analysis to nearly
-full semantic analysis with some optimizations, and will attempt to
-generate meaningful errors and warnings for invalid or deprecated IDL.
-
-libIDL exports functionality used to generate detailed conforming
-error and warning messages in gcc-like format, and also comes with a
-default backend to generate IDL into a file or string (useful for
-customized messages or comments in the output).  The IDL backend is
-complete enough that most generated IDL can be reparsed by libIDL
-without errors. libIDL returns separate syntax and namespace trees,
-and includes functionality to hide syntactical information from the
-primary tree, while keeping it accessible through the namespace for
-type information and name lookup.
-
-Optional extensions to standard IDL can be enabled using parse flags.
-These include node properties, embedded code fragments, and XPIDL.
-Nodes can also have declarations tags which assign particular
-attributions to certain IDL constructs to further facilitate custom
-applications.
-
-@node Example, Reference, Overview, top
-@chapter Usage
-The following C program using libIDL will parse an IDL file and print
-the Repository IDs of the interfaces in the IDL module.
-
-@example
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <libIDL/IDL.h>
-
-gboolean
-print_repo_id (IDL_tree_func_data *tfd, gpointer user_data)
-@{
-	char *repo_id = NULL;
-
-	if (IDL_NODE_TYPE (tfd->tree) == IDLN_INTERFACE)
-		repo_id = IDL_IDENT_REPO_ID (IDL_INTERFACE (tfd->tree).ident);
-
-	if (repo_id)
-		printf ("%s\n", repo_id);
-
-	return TRUE;
-@}
-
-int 
-main (int argc, char *argv[])
-@{
-	IDL_tree tree;
-	IDL_ns ns;
-	char *fn;
-	int rv;
-
-	if (argc < 2) @{
-		fprintf (stderr, "usage: %s <file>\n", argv[0]);
-		exit (1);
-	@}
-	fn = argv[1];
-
-	rv = IDL_parse_filename (fn, NULL, NULL, &tree, &ns, 0, IDL_WARNING1);
-
-	if (rv == IDL_ERROR || rv < 0) @{
-		if (rv < 0)
-			perror (fn);
-		exit (1);
-	@}
-	IDL_tree_walk_in_order (tree, print_repo_id, NULL);
-	IDL_ns_free (ns);
-	IDL_tree_free (tree);
-
-	return 0;
-@}
-@end example
-
-@node Reference, Function Index, Example, top
-@chapter Reference
-
-@menu
-* Data Types::                Constructed data types used.
-* Functions::                 Functions provided.
-* Extensions::                Extensions provided to standard IDL.
-* Tree Structure::            The C IDL tree representation.
-@end menu
-
-@node Data Types, Functions, , Reference
-@chapter Data Types
-
-@itemize @bullet
-@item
-IDL_tree
-
-A semi-opaque tree which encapsulates an IDL tree node.  Must be freed
-with IDL_tree_free (@pxref{Functions}).
-
-@item
-IDL_ns
-
-A semi-opaque structure which encapsulates the IDL module namespace.
-Must be freed with IDL_ns_free (@pxref{Functions}).
-
-@item
-IDL_msg_callback
-
-Defined as typedef int (*IDL_msg_callback)(int LEVEL, int NUM, int LINE,
-const char *NAME, const char *ERR).  A function of this type can be
-optionally passed to IDL_parse_filename to be called when a parse
-warning or error occurs.
-
-@item
-IDL_tree_func
-
-Defined as typedef gboolean (*IDL_tree_func) (IDL_tree_func_data
-*TREE_FUNC_DATA, gpointer DATA).  A function of this type is passed to
-IDL_tree_walk_in_order to traverse the tree.  TREE_FUNC_DATA contains an
-up traversal hierarchy of the current traversal, as well as some state
-information.  The current node being processed is given by
-TREE_FUNC_DATA->tree.
-
-@end itemize
-
-@node Functions, Extensions, Data Types, Reference
-@chapter Functions
-
-@itemize @bullet
-@item
-Function: int IDL_parse_filename (const char *NAME, const char *CPP_ARGS,
-IDL_msg_callback CALLBACK, IDL_tree *TREE, IDL_ns *NS, unsigned long FLAGS,
-int MAX_MESSAGE_LEVEL)
-@findex IDL_parse_filename
-
-Parse an file containing an IDL definition into a parse tree.  Returns
-IDL_SUCCESS if successful, or IDL_ERROR if there was a parse error.  If
--1 is returned, errno will be set accordingly.  Usually, if IDL_ERROR is
-returned, all one needs to do is exit with a non-zero status, since
-libIDL will probably have made the reason for failure explictly known.
-
-@itemize @minus
-@item
-NAME: required, specifies the filename to be parsed.
-
-@item
-CPP_ARGS: optional, if non-NULL, specifies extra arguments to pass to
-the C preprocessor.  The most common type of string would be in the form
-of -I<dir> to include additional directories for file inclusion search,
-or defines in the form of -D<define>=<value>.
-
-@item
-CALLBACK: optional, if non-NULL, this function will be called when a
-warning or error is generated (@pxref{Data Types}).  If not given,
-warnings and errors will be sent to stderr.  All errors and warning,
-including callbacks, are subject to MAX_MESSAGE_LEVEL as described
-below.
-
-@item
-TREE: optional, if non-NULL, points to an IDL_tree * to return the
-generated tree which must be freed with IDL_tree_free.  If NULL, the
-tree is freed and not returned.
-
-@item
-NS: optional, if non-NULL, points to an IDL_ns * to return the namespace
-tree which must be freed with IDL_ns_free.  If NULL, the tree is freed
-and not returned.  If TREE is NULL, then NS must also be NULL, since the
-namespace is created as the AST is generated.
-
-@item
-FLAGS: optional, specifies extra flags for parsing or 0.  The various
-flags are described here.
-
-@item
-General Parse Flags
-
-@itemize @minus
-@item
-IDLF_NO_EVAL_CONST: instructs the parser not to evaluate constant expressions.
-
-@item
-IDLF_COMBINE_REOPENED_MODULES: instructs the parser to combine modules
-defined later in the IDL code in the first module node in the tree.
-
-@item
-IDLF_PREFIX_FILENAME: instructs the parser to prefix the filename to the
-namespace.
-
-@item
-IDLF_IGNORE_FORWARDS: instructs the parser to not try to resolve and
-print messages for unresovled forward declarations.
-
-@item
-IDLF_PEDANTIC: instructs the parser to display stricter errors and
-warnings.
-
-@item
-IDLF_INHIBIT_TAG_ONLY: only tag inhibited nodes, do not remove them.
-Use IDL_tree_remove_inhibits to remove them at a later time.
-
-@item
-IDLF_INHIBIT_INCLUDES: causes libIDL to automatically inhibit IDL trees
-in included files.
-@end itemize
-
-@item
-Syntax Extension Flags
-
-@itemize @minus
-@item
-IDLF_TYPECODES: understand the `TypeCode' keyword extension.
-
-@item
-IDLF_XPIDL: enable XPIDL syntax.
-
-@item
-IDLF_PROPERTIES: enable support for node properties.
-
-@item
-IDLF_CODEFRAGS: enable support for embedded code fragments.
-@end itemize
-
-@item
-MAX_MESSAGE_LEVEL:
-
-This specifies the maximum message level to display.  Possible values
-are -1 for no messages, IDL_ERROR for errors only, or IDL_WARNING1,
-IDL_WARNING2 and IDL_WARNING3.  A typical value is IDL_WARNING1, which
-will limit verbosity.  IDL_WARNINGMAX is defined as the value in which
-all messages will be displayed.
-
-@end itemize
-
-@item
-Function: void IDL_tree_walk_in_order (IDL_tree ROOT, IDL_tree_func
-FUNC, gpointer DATA)
-@findex IDL_tree_walk_in_order
-
-Walks an IDL_tree, calling FUNC for every node.  If the FUNC returns
-TRUE for a particular node, that particular node will also be traversed,
-if FALSE is returned, that particular node will be skipped, in the
-assumption that the function has taken care of it.
-
-@itemize @minus
-@item
-ROOT: required, specifies the IDL_tree to traverse.
-
-@item
-FUNC: required, specifies the callback function (@pxref{Data Types}).
-
-@item
-DATA: optional, specifies the callback data.
-
-@end itemize
-
-@item
-Function: void IDL_tree_free (IDL_tree TREE)
-@findex IDL_tree_free
-
-Frees the memory associated with TREE.
-
-@item
-Function: void IDL_ns_free (IDL_ns NS)
-@findex IDL_ns_free
-
-Frees the memory associated with NS.
-
-@end itemize
-
-@node Extensions, Tree Structure, Functions, Reference
-@chapter Extensions
-This page documents extensions to standard IDL which libIDL will
-understand.  To maintain portability, it is recommended that these
-extensions are only used with some sort of C preprocessor define so they
-can be conditionally omitted.
-
-@itemize @bullet
-@item
-__declspec (<spec>)
-
-This token assigns special attributions to particular IDL constructs.
-
-@itemize @minus
-@item
-inhibit
-
-If __declspec (inhibit) is placed before a definition or export, that
-module or interface definition will be removed from the tree.  The tree
-is only deleted when the IDL_ns component is freed, so it can be
-traversed from the namespace component for extended information, but
-will be omitted from the primary tree.
-
-@end itemize
-
-@end itemize
-
-@node Tree Structure, , Extensions, Reference
-@chapter Tree Structure
-
-@node Function Index, , Reference, top
-@chapter Function Index
-@printindex fn
-
-@contents
-@bye
Index: libIDL/libIDL2.texi
===================================================================
RCS file: /cvs/gnome/libIDL/libIDL2.texi,v
retrieving revision 1.21
diff -u -p -u -r1.21 libIDL2.texi
--- libIDL/libIDL2.texi	1999/04/13 03:27:02	1.21
+++ libIDL/libIDL2.texi	2001/09/12 17:03:39
@@ -1,19 +1,19 @@
 \input texinfo @c -*- mode: texinfo -*-
-@setfilename libIDL.info
-@settitle libIDL
+@setfilename libIDL2.info
+@settitle libIDL2
 @setchapternewpage odd
 
 @ifinfo
 @dircategory Libraries
 @direntry
-* libIDL: (libIDL).     Interface Definition Language parsing library.
+* libIDL2: (libIDL2).     Interface Definition Language parsing library.
 @end direntry
 
 Copyright 1998 Andrew T. Veliath
 @end ifinfo
 
 @titlepage
-@title libIDL
+@title libIDL2
 @author Andrew T. Veliath
 
 @page
Index: src/idl-compiler/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/idl-compiler/Makefile.am,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile.am
--- src/idl-compiler/Makefile.am	2001/08/15 07:14:07	1.14
+++ src/idl-compiler/Makefile.am	2001/09/12 17:03:39
@@ -1,6 +1,5 @@
-bin_PROGRAMS=orbit-idl
+bin_PROGRAMS=orbit-idl-2
 
-includedir=$(prefix)/include
 orbitlibdir=$(libdir)/orbit-idl
 
 INCLUDES=-I$(top_builddir) -I$(top_builddir)/include \
@@ -9,13 +8,13 @@ INCLUDES=-I$(top_builddir) -I$(top_build
 	-DORBITLIBDIR="\"$(orbitlibdir)\"" \
 	-DDEBUG -DVERSION=\"$(ORBIT_VERSION)\"
 
-orbit_idl_DEPENDENCIES = $(top_builddir)/libIDL/libIDL-2.la
-orbit_idl_LDADD = \
+orbit_idl_2_DEPENDENCIES = $(top_builddir)/libIDL/libIDL-2.la
+orbit_idl_2_LDADD = \
 	$(top_builddir)/libIDL/libIDL-2.la \
 	@GLIB_LIBS@ \
 	-lpopt -lm
 
-orbit_idl_SOURCES=orbit-idl-main.c \
+orbit_idl_2_SOURCES=orbit-idl-main.c \
 		   orbit-idl-driver.c \
 		   orbit-idl-backends.c \
 		   orbit-idl-passes.c \
@@ -39,7 +38,8 @@ orbit_idl_SOURCES=orbit-idl-main.c \
 	orbit-idl-marshal.c \
 	orbit-idl-marshal.h
 
-include_DATA=orbit-idl2.h
+orbitidlincludedir=$(includedir)/orbit-2.0
+orbitidlinclude_HEADERS=orbit-idl2.h
 
 $(top_builddir)/libIDL/libIDL-2.la:
 	$(MAKE) -C $(top_builddir)/libIDL libIDL-2.la
Index: src/orb/orb-core/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/orb-core/Makefile.am,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile.am
--- src/orb/orb-core/Makefile.am	2001/09/04 18:05:29	1.31
+++ src/orb/orb-core/Makefile.am	2001/09/12 17:03:39
@@ -48,7 +48,7 @@ OPS_IDLOUT= corba-ops.h corba-ops-stubs.
 IFACE_IDLOUT=orbit-interface-common.c
 
 $(liborb_core_la_OBJECTS) : $(BUILT_SOURCES)
-IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl
+IDL_COMPILER = $(top_builddir)/src/idl-compiler/orbit-idl-2
 
 IDL_FLAGS = -I$(top_srcdir)/src/idl/CORBA_PIDL			\
 	-I$(top_srcdir)/src/idl/CORBA				\
Index: src/orb/poa/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/orb/poa/Makefile.am,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.am
--- src/orb/poa/Makefile.am	2001/09/04 18:05:30	1.16
+++ src/orb/poa/Makefile.am	2001/09/12 17:03:39
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES=liborb-poa.la
 
-IDL = $(top_builddir)/src/idl-compiler/orbit-idl
+IDL = $(top_builddir)/src/idl-compiler/orbit-idl-2
 INCLUDES=-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_builddir)/src/orb/orb-core \
@@ -41,4 +41,5 @@ IDL_FLAGS= -I$(top_srcdir)/src/idl/CORBA
 	--define=Object=OObject --define=TypeCode=TTypeCode	\
         --showcpperrors
 IDL_FILES=poa-defs.idl
+IDL_DIR=./
 include $(top_srcdir)/Makefile.shared
Index: src/services/name/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/src/services/name/Makefile.am,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.am
--- src/services/name/Makefile.am	2001/08/15 07:14:12	1.5
+++ src/services/name/Makefile.am	2001/09/12 17:03:39
@@ -1,10 +1,10 @@
-libORBitservicesincludedir = $(includedir)/ORBitservices
+libORBitservicesincludedir = $(includedir)/orbit-2.0/ORBitservices
 
 lib_LTLIBRARIES=libORBitCosNaming-2.la
 
-bin_PROGRAMS = name-client orbit-name-server
+bin_PROGRAMS = name-client-2 orbit-name-server-2
 
-lib_LIBRARIES = libname-server.a
+lib_LIBRARIES = libname-server-2.a
 
 libORBitCosNaming_2_la_SOURCES = 						\
 	CosNaming-common.c 						\
@@ -48,19 +48,19 @@ LDADDS = \
 $(srcdir)/name-client.c $(srcdir)/orbit-name-server.c \
 $(srcdir)/boot.c: CosNaming.h
 
-name_client_SOURCES = name-client.c name-support.c name-support.h
-name_client_LDFLAGS = $(FLAGS)
-name_client_DEPENDENCIES = $(DEPS) CosNaming.h
-name_client_LDADD = $(LDADDS)
+name_client_2_SOURCES = name-client.c name-support.c name-support.h
+name_client_2_LDFLAGS = $(FLAGS)
+name_client_2_DEPENDENCIES = $(DEPS) CosNaming.h
+name_client_2_LDADD = $(LDADDS)
 
-libname_server_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
+libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
 			   name-support.c name-support.h
-libname_server_a_DEPENDENCIES = $(DEPS) CosNaming.h
+libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
 
-orbit_name_server_SOURCES = boot.c
-orbit_name_server_LDFLAGS = $(FLAGS)
-orbit_name_server_DEPENDENCIES = $(DEPS) CosNaming.h
-orbit_name_server_LDADD = libname-server.a $(LDADDS)
+orbit_name_server_2_SOURCES = boot.c
+orbit_name_server_2_LDFLAGS = $(FLAGS)
+orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
+orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
 
 EXTRA_DIST = CosNaming.idl
 
Index: test/Makefile.am
===================================================================
RCS file: /cvs/gnome/ORBit2/test/Makefile.am,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile.am
--- test/Makefile.am	2001/08/24 18:56:46	1.13
+++ test/Makefile.am	2001/09/12 17:03:39
@@ -4,7 +4,7 @@ INCLUDES=-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	$(LINC_CFLAGS) \
 	$(GLIB_CFLAGS)
-bin_PROGRAMS=ior-decode typelib-dump
+bin_PROGRAMS=ior-decode-2 typelib-dump
 noinst_PROGRAMS=test1 \
 	echo-client echo-server \
 	empty-client empty-server \
@@ -34,7 +34,7 @@ IDLOUT=test1-stubs.c test1-skels.c test1
 test1_SOURCES=test1.c $(IDLOUT)
 $(srcdir)/test1.c: test1.h
 
-ior_decode_SOURCES=ior-decode.c
+ior_decode_2_SOURCES=ior-decode.c
 
 typelib_dump_SOURCES=typelib-dump.c

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]