diff -ur ORBit-0.5.17.orig/src/Makefile.am ORBit-0.5.17/src/Makefile.am
--- ORBit-0.5.17.orig/src/Makefile.am 1999-06-09 22:26:57.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.am 2009-04-09 14:51:55.000000000 +0100
@@ -1 +1 @@
-SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons
diff -ur ORBit-0.5.17.orig/src/Makefile.in ORBit-0.5.17/src/Makefile.in
--- ORBit-0.5.17.orig/src/Makefile.in 2002-06-06 12:34:43.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.in 2009-04-09 14:53:28.000000000 +0100
@@ -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 =
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.am ORBit-0.5.17/src/orb/Makefile.am
--- ORBit-0.5.17.orig/src/orb/Makefile.am 2002-06-06 12:07:39.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.am 2009-04-09 15:03:50.000000000 +0100
@@ -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 \
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.in ORBit-0.5.17/src/orb/Makefile.in
--- ORBit-0.5.17.orig/src/orb/Makefile.in 2002-06-06 12:34:48.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.in 2009-04-09 15:03:31.000000000 +0100
@@ -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
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.am ORBit-0.5.17/src/services/name/Makefile.am
--- ORBit-0.5.17.orig/src/services/name/Makefile.am 2002-06-06 12:07:45.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.am 2009-04-09 15:08:51.000000000 +0100
@@ -18,6 +18,8 @@
libORBitCosNaming_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
+
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
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.in ORBit-0.5.17/src/services/name/Makefile.in
--- ORBit-0.5.17.orig/src/services/name/Makefile.in 2002-06-06 12:34:52.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.in 2009-04-09 15:09:48.000000000 +0100
@@ -171,7 +171,7 @@
AR = ar
LTLIBRARIES = $(lib_LTLIBRARIES)
-libORBitCosNaming_la_LIBADD =
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
libORBitCosNaming_la_OBJECTS = CosNaming-common.lo CosNaming-stubs.lo \
LName.lo
bin_PROGRAMS = name-client$(EXEEXT) orbit-name-server$(EXEEXT) \