orbitcpp r284 - in trunk: . orbitcpp/idl-compiler orbitcpp/idl-compiler/types orbitcpp/orb-cpp orbitcpp/services/name test

[tml svn gnome org]

Author: tml
Date: Mon Feb  4 13:29:17 2008
New Revision: 284
URL: http://svn.gnome.org/viewvc/orbitcpp?rev=284&view=rev

Log:
2008-02-04  Tor Lillqvist  <tml novell com>

	* MAINTAINERS: Update syntax to match commit requirement.

2008-01-22  Tor Lillqvist  <tml novell com>

	Fixes to build on Windows.

	* configure.in: Use the --enable-runtime-pseudo-reloc linker
	switch on Windows. Needed by the test programs.

	* orbitcpp/idl-compiler/Makefile.am
	(libORBit_idl_backend_cpp_la_LDFLAGS): Use -no-undefined so that
	libtool bothers building a DLL on Windows. Should not hurt on Unix
	either. Use -module -avoid-version instead of specifying any
	libtool versioning information. Using -version-info means that on
	Windows the DLL basename gets libtool versioning cruft inserted,
	producing a name like libORBit-idl-backend-cpp-10.dll. Thus it
	would not be found using just the "-l cpp" flag to orbit-idl-2.
	(libORBit_idl_backend_cpp_la_LIBADD): Link with ORBITCPP_IDL_LIBS.

	* orbitcpp/idl-compiler/types/Makefile.am (INCLUDES): Drop extra
	trailing slash which confuses mingw.

	* orbitcpp/orb-cpp/Makefile.am
	* orbitcpp/services/name/Makefile.am: Use -no-undefined so that we
	do get a DLL on Windows.

	* test/Makefile.am (check_PROGRAMS): client_server.cc uses POSIX
	APIs, so don't bother with test_runner on Windows.



Modified:
   trunk/ChangeLog
   trunk/MAINTAINERS
   trunk/configure.in
   trunk/orbitcpp/idl-compiler/Makefile.am
   trunk/orbitcpp/idl-compiler/types/Makefile.am
   trunk/orbitcpp/orb-cpp/Makefile.am
   trunk/orbitcpp/services/name/Makefile.am
   trunk/test/Makefile.am

Modified: trunk/MAINTAINERS
==============================================================================
--- trunk/MAINTAINERS	(original)
+++ trunk/MAINTAINERS	Mon Feb  4 13:29:17 2008
@@ -2,7 +2,12 @@
 http://orbitcpp.sourceforge.net
 and use the mailing list.
 
-Bowie Owens <bowie owens csiro au>
+Bowie Owens
+E-mail: bowie owens csiro au
+Userid: bowens
+
 Gerdo Erdi <cactus cactus rulez org>
-Murray Cumming <murrayc usa net>
 
+Murray Cumming
+E-mail: murrayc usa net
+Userid: murrayc

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Feb  4 13:29:17 2008
@@ -41,6 +41,25 @@
 ])
 ACLOCAL="$ACLOCAL $ac_cv_orbit_aclocal_flags"
 
+AC_CANONICAL_HOST
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    MINGW_LDFLAGS="-Wl,--enable-runtime-pseudo-reloc"
+    ;;
+  *)
+    os_win32=no
+    MINGW_LDFLAGS=
+    ;;
+esac
+AC_MSG_RESULT([$os_win32])
+
+AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"])
+
+AC_SUBST(MINGW_LDFLAGS)
+LDFLAGS="$MINGW_LDFLAGS $LDFLAGS"
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL

Modified: trunk/orbitcpp/idl-compiler/Makefile.am
==============================================================================
--- trunk/orbitcpp/idl-compiler/Makefile.am	(original)
+++ trunk/orbitcpp/idl-compiler/Makefile.am	Mon Feb  4 13:29:17 2008
@@ -58,5 +58,5 @@
 	main.cc 
 
 libORBit_idl_backend_cpp_la_SOURCES = $(headers) $(modules)
-libORBit_idl_backend_cpp_la_LDFLAGS = -version-info $(LT_VERSION)
-libORBit_idl_backend_cpp_la_LIBADD = types/libidl-cpp-types.la
+libORBit_idl_backend_cpp_la_LDFLAGS = -module -avoid-version -no-undefined
+libORBit_idl_backend_cpp_la_LIBADD = types/libidl-cpp-types.la $(ORBITCPP_IDL_LIBS)

Modified: trunk/orbitcpp/idl-compiler/types/Makefile.am
==============================================================================
--- trunk/orbitcpp/idl-compiler/types/Makefile.am	(original)
+++ trunk/orbitcpp/idl-compiler/types/Makefile.am	Mon Feb  4 13:29:17 2008
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_builddir)                     \
 	-I$(top_srcdir)                      \
-	-I$(top_srcdir)/orbitcpp/idl-compiler/ \
+	-I$(top_srcdir)/orbitcpp/idl-compiler \
 	-DVERSION=\"$(ORBIT_VERSION)\"        \
 	$(WARN_CFLAGS)                        \
 	$(ORBITCPP_IDL_CFLAGS)

Modified: trunk/orbitcpp/orb-cpp/Makefile.am
==============================================================================
--- trunk/orbitcpp/orb-cpp/Makefile.am	(original)
+++ trunk/orbitcpp/orb-cpp/Makefile.am	Mon Feb  4 13:29:17 2008
@@ -49,5 +49,5 @@
 			poa-cpp-skels.cc
 			$(libORBit_2_cppinclude_HEADERS)
 
-libORBit_2_cpp_la_LDFLAGS = -version-info $(LT_VERSION)
+libORBit_2_cpp_la_LDFLAGS = -version-info $(LT_VERSION) -no-undefined
 libORBit_2_cpp_la_LIBADD = $(ORBITCPP_LIBS) #-lstdc++

Modified: trunk/orbitcpp/services/name/Makefile.am
==============================================================================
--- trunk/orbitcpp/services/name/Makefile.am	(original)
+++ trunk/orbitcpp/services/name/Makefile.am	Mon Feb  4 13:29:17 2008
@@ -18,10 +18,9 @@
 	CosNaming.h \
 	CosNaming-cpp-common.h \
 	CosNaming-cpp-stubs.h
-	
 
-libORBitCosNaming_2_cpp_la_LDFLAGS = -version-info $(LT_VERSION)
-libORBitCosNaming_2_cpp_la_LIBADD = $(ORBITCPP_LIBS)
 
+libORBitCosNaming_2_cpp_la_LDFLAGS = -version-info $(LT_VERSION) -no-undefined
+libORBitCosNaming_2_cpp_la_LIBADD = $(top_builddir)/orbitcpp/orb-cpp/libORBit-2-cpp.la $(ORBITCPP_LIBS)
 
 

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	(original)
+++ trunk/test/Makefile.am	Mon Feb  4 13:29:17 2008
@@ -2,6 +2,9 @@
 
 noinst_INCLUDES = tut.h tut_reporter.h tut_restartable.h client_server.h
 
+if OS_WIN32
+else
 check_PROGRAMS = test_runner
+endif
 
 test_runner_SOURCES = main.cc client_server.cc test_factory.cc test_policy.cc