Attachment #87696 for bug #130735

Line 1 Link Here

(-)ORBit-0.5.17/src/Makefile.am.orig (-1 / +1 lines)
1	SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons	1	SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons

Lines 37-41 Link Here

(-)ORBit-0.5.17/src/IIOP/Makefile.am.orig (-1 / +1 lines)
37	iiop-endian.h	37	iiop-endian.h
38		38
39	libIIOP_la_LIBADD=$(libwrap_files) $(libwrap_deps)	39	libIIOP_la_LIBADD=$(libwrap_files) $(libwrap_deps) @GLIB_LIBS@ $(top_builddir)/src/ORBitutil/libORBitutil.la
40		40
41	$(libwrap_files): make_libwrap_files	41	$(libwrap_files): make_libwrap_files

Lines 97-104 Link Here

(-)ORBit-0.5.17/src/orb/Makefile.am.orig (-1 / +2 lines)
97	$(IDL):	97	$(IDL):
98	$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler	98	$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
99		99
		100	libORBit_la_DEPENDENCIES = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la
100	libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	101	libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
101	libORBit_la_LIBADD = $(GLIB_LIBS) -lm	102	libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm
102		103
103	BUILT_SOURCES = \	104	BUILT_SOURCES = \
104	orbit.h \	105	orbit.h \

Lines 18-23 Link Here

(-)ORBit-0.5.17/src/services/name/Makefile.am.orig (+3 lines)
18	libORBitCosNaming_la_LDFLAGS = \	18	libORBitCosNaming_la_LDFLAGS = \
19	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	19	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
20		20
		21	libORBitCosNaming_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la \
		22	$(top_builddir)/src/orb/libORBit.la @GLIB_LIBS@ -lm
		23
21	INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@	24	INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
22		25
23	IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl	26	IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl

Return to bug 130735