--- 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/IIOP/Makefile.am.orig	2005-05-17 09:37:43.000000000 -0700
+++ ORBit-0.5.17/src/IIOP/Makefile.am		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.orig	2006-05-25 15:00:11.000000000 -0700
+++ ORBit-0.5.17/src/orb/Makefile.am	2006-05-25 15:02:56.000000000 -0700
@@ -97,8 +97,9 @@
 $(IDL):
 	$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
 
+libORBit_la_DEPENDENCIES =  $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la
 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.orig		2006-05-17 09:35:17.000000000 -0700
+++ ORBit-0.5.17/src/services/name/Makefile.am			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 \
+ $(top_builddir)/src/orb/libORBit.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