Attachment #87078 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 97-103 Link Here

(-)ORBit-0.5.17/src/Makefile.in.orig (-1 / +1 lines)
97	YACC = @YACC@	97	YACC = @YACC@
98	pkglibdir = @pkglibdir@	98	pkglibdir = @pkglibdir@
99		99
100	SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons	100	SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
101	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	101	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
102	CONFIG_HEADER = ../config.h	102	CONFIG_HEADER = ../config.h
103	CONFIG_CLEAN_FILES =	103	CONFIG_CLEAN_FILES =

Lines 37-41 Link Here

(-)ORBit-0.5.17/src/IIOP/Makefile.am (-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 98-104 Link Here

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

Lines 18-23 Link Here

(-)ORBit-0.5.17/src/services/name/Makefile.am (+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	@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

Lines 114-119 Link Here

(-)ORBit-0.5.17/src/IIOP/Makefile.in (-2 / +1 lines)
114	libIIOPinclude_HEADERS = IIOP-config.h IIOP-types.h IIOP.h giop-msg-buffer.h iiop-encoders.h iiop-endian.h	114	libIIOPinclude_HEADERS = IIOP-config.h IIOP-types.h IIOP.h giop-msg-buffer.h iiop-encoders.h iiop-endian.h
115		115
116		116	libIIOP_la_LIBADD=$(libwrap_files) $(libwrap_deps) @GLIB_LIBS@ $(top_builddir)/src/ORBitutil/libORBitutil.la
117	libIIOP_la_LIBADD = $(libwrap_files) $(libwrap_deps)
118		117
119	BUILT_SOURCES = $(libwrap_files)	118	BUILT_SOURCES = $(libwrap_files)




IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl

libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
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


CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
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.new      2006-05-17 09:34:00.000000000 -0700

AR = ar
LTLIBRARIES =  $(lib_LTLIBRARIES)

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) \

	done

libORBitCosNaming.la: $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_DEPENDENCIES)
	$(LINK) -rpath $(libdir) $(libORBitCosNaming_la_LDFLAGS) $(libORBitCosNaming_la_OBJECTS) \
	$(libORBitCosNaming_la_LIBADD) $(LIBS)

mostlyclean-binPROGRAMS:


Return to bug 130735

Lines 116-122 Link Here

(-)ORBit-0.5.17/src/orb/Makefile.in (-5 / +8 lines)
116	IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl	116	IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
117		117
118	libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	118	libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
119	libORBit_la_LIBADD = $(GLIB_LIBS) -lm	119	libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la @GLIB_LIBS@ -lm
120		120
121	BUILT_SOURCES = orbit.h interface_repository.h interface_repository-common.c interface_repository-stubs.c	121	BUILT_SOURCES = orbit.h interface_repository.h interface_repository-common.c interface_repository-stubs.c
122		122
Lines 132-138 Link Here
132	CPPFLAGS = @CPPFLAGS@	132	CPPFLAGS = @CPPFLAGS@
133	LDFLAGS = @LDFLAGS@	133	LDFLAGS = @LDFLAGS@
134	LIBS = @LIBS@	134	LIBS = @LIBS@
135	libORBit_la_DEPENDENCIES =	135	libORBit_la_DEPENDENCIES = $(top_builddir)/src/IIOP/libIIOP.la \
		136	$(top_builddir)/src/ORBitutil/libORBitutil.la
136	libORBit_la_OBJECTS = interface_repository-common.lo \	137	libORBit_la_OBJECTS = interface_repository-common.lo \
137	interface_repository-stubs.lo allocators.lo cdr.lo env.lo options.lo \	138	interface_repository-stubs.lo allocators.lo cdr.lo env.lo options.lo \
138	orb.lo orbit.lo poa.lo orbit_poa.lo typecode.lo corba_object.lo \	139	orb.lo orbit.lo poa.lo orbit_poa.lo typecode.lo corba_object.lo \
139	-- ORBit-0.5.17/src/services/name/Makefile.in 2006-05-17 09:35:17.000000000 -0700	140	++ ORBit-0.5.17/src/services/name/Makefile.in.new 2006-05-17 09:34:00.000000000 -0700
Lines 171-177 Link Here
171	AR = ar	171	AR = ar
172	LTLIBRARIES = $(lib_LTLIBRARIES)	172	LTLIBRARIES = $(lib_LTLIBRARIES)
173		173
174	libORBitCosNaming_la_LIBADD =	174	libORBitCosNaming_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la \
		175	$(top_builddir)/src/orb/libORBit.la @GLIB_LIBS@ -lm
175	libORBitCosNaming_la_OBJECTS = CosNaming-common.lo CosNaming-stubs.lo \	176	libORBitCosNaming_la_OBJECTS = CosNaming-common.lo CosNaming-stubs.lo \
176	LName.lo	177	LName.lo
177	bin_PROGRAMS = name-client$(EXEEXT) orbit-name-server$(EXEEXT) \	178	bin_PROGRAMS = name-client$(EXEEXT) orbit-name-server$(EXEEXT) \
Lines 319-325 Link Here
319	done	320	done
320		321
321	libORBitCosNaming.la: $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_DEPENDENCIES)	322	libORBitCosNaming.la: $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_DEPENDENCIES)
322	$(LINK) -rpath $(libdir) $(libORBitCosNaming_la_LDFLAGS) $(libORBitCosNaming_la_OBJECTS) $(libORBitCosNaming_la_LIBADD) $(LIBS)	323	$(LINK) -rpath $(libdir) $(libORBitCosNaming_la_LDFLAGS) $(libORBitCosNaming_la_OBJECTS) \
		324	$(libORBitCosNaming_la_LIBADD) $(LIBS)
323		325
324	mostlyclean-binPROGRAMS:	326	mostlyclean-binPROGRAMS:
325		327