--- ORBit-0.5.17/src/Makefile.am.orig	2006-05-19 03:27:01.000000000 -0700
+++ ORBit-0.5.17/src/Makefile.am	2006-05-19 03:25:35.000000000 -0700
@@ -1 +1 @@
-SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons
--- ORBit-0.5.17/src/Makefile.in.orig	2006-05-19 03:28:36.000000000 -0700
+++ ORBit-0.5.17/src/Makefile.in	2006-05-19 03:27:50.000000000 -0700
@@ -97,7 +97,7 @@
 YACC = @YACC@
 pkglibdir = @pkglibdir@
 
-SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
--- ORBit-0.5.17/src/IIOP/Makefile.am		2005-05-17 09:37:43.000000000 -0700
+++ ORBit-0.5.17/src/IIOP/Makefile.am.new	2006-05-17 09:38:05.000000000 -0700
@@ -37,5 +37,5 @@
 	iiop-endian.h
 
-libIIOP_la_LIBADD=$(libwrap_files) $(libwrap_deps)
+libIIOP_la_LIBADD=$(libwrap_files) $(libwrap_deps) @GLIB_LIBS@ $(top_builddir)/src/ORBitutil/libORBitutil.la
 
 $(libwrap_files): make_libwrap_files
--- ORBit-0.5.17/src/orb/Makefile.am		2006-05-17 09:36:45.000000000 -0700
+++ ORBit-0.5.17/src/orb/Makefile.am.new	2006-05-17 09:37:19.000000000 -0700
@@ -98,7 +98,7 @@
 	$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm
 
 BUILT_SOURCES = \
 	orbit.h	\
--- ORBit-0.5.17/src/services/name/Makefile.am		2006-05-17 09:35:17.000000000 -0700
+++ ORBit-0.5.17/src/services/name/Makefile.am.new	2006-05-17 09:34:48.000000000 -0700
@@ -18,6 +18,9 @@
 libORBitCosNaming_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la \
+	@GLIB_LIBS@ -lm
+
 INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
 
 IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
--- ORBit-0.5.17/src/IIOP/Makefile.in		2006-05-17 09:17:27.000000000 -0700
+++ ORBit-0.5.17/src/IIOP/Makefile.in.new	2006-05-17 09:17:51.000000000 -0700
@@ -114,6 +114,5 @@
 libIIOPinclude_HEADERS =  	IIOP-config.h 	IIOP-types.h 	IIOP.h 	giop-msg-buffer.h 	iiop-encoders.h 	iiop-endian.h
 
-
-libIIOP_la_LIBADD = $(libwrap_files) $(libwrap_deps)
+libIIOP_la_LIBADD=$(libwrap_files) $(libwrap_deps) @GLIB_LIBS@ $(top_builddir)/src/ORBitutil/libORBitutil.la
 
 BUILT_SOURCES = $(libwrap_files)
--- ORBit-0.5.17/src/orb/Makefile.in		2006-05-17 09:12:06.000000000 -0700
+++ ORBit-0.5.17/src/orb/Makefile.in.new	2006-05-17 04:28:02.000000000 -0700
@@ -116,7 +116,7 @@
 IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
 
 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm
 
 BUILT_SOURCES =  	orbit.h		interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
 
@@ -132,7 +132,8 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libORBit_la_DEPENDENCIES = 
+libORBit_la_DEPENDENCIES =  $(top_builddir)/src/IIOP/libIIOP.la \
+$(top_builddir)/src/ORBitutil/libORBitutil.la
 libORBit_la_OBJECTS =  interface_repository-common.lo \
 interface_repository-stubs.lo allocators.lo cdr.lo env.lo options.lo \
 orb.lo orbit.lo poa.lo orbit_poa.lo typecode.lo corba_object.lo \
--- ORBit-0.5.17/src/services/name/Makefile.in          2006-05-17 09:35:17.000000000 -0700
+++ ORBit-0.5.17/src/services/name/Makefile.in.new      2006-05-17 09:34:00.000000000 -0700
@@ -171,7 +171,8 @@
 AR = ar
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
-libORBitCosNaming_la_LIBADD = 
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la \
+ $(top_builddir)/src/orb/libORBit.la @GLIB_LIBS@ -lm
 libORBitCosNaming_la_OBJECTS =  CosNaming-common.lo CosNaming-stubs.lo \
 LName.lo
 bin_PROGRAMS =  name-client$(EXEEXT) orbit-name-server$(EXEEXT) \
@@ -319,7 +320,8 @@
 	done
 
 libORBitCosNaming.la: $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libORBitCosNaming_la_LDFLAGS) $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libORBitCosNaming_la_LDFLAGS) $(libORBitCosNaming_la_OBJECTS) \
+	$(libORBitCosNaming_la_LIBADD) $(LIBS)
 
 mostlyclean-binPROGRAMS: