patch-src_idl-compiler_Makefile_in 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. --- ORBit2-2.14.19.orig/src/idl-compiler/Makefile.in 2010-09-28 11:39:39.000000000 +0200
  2. +++ ORBit2-2.14.19/src/idl-compiler/Makefile.in 2011-03-25 20:28:46.000000000 +0100
  3. @@ -66,15 +66,13 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
  4. depcomp = $(SHELL) $(top_srcdir)/depcomp
  5. am__depfiles_maybe = depfiles
  6. am__mv = mv -f
  7. -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  8. - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  9. +COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  10. + $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
  11. LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  12. - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  13. - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  14. -CCLD = $(CC)
  15. -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  16. - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  17. - $(LDFLAGS) -o $@
  18. + --mode=compile $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  19. + $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
  20. +CCLD = $(CC_FOR_BUILD)
  21. +LINK = $(CCLD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
  22. SOURCES = $(orbit_idl_2_SOURCES)
  23. DIST_SOURCES = $(orbit_idl_2_SOURCES)
  24. am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  25. @@ -178,8 +176,8 @@ ORBIT_ALIGNOF_CORBA_SHORT = @ORBIT_ALIGN
  26. ORBIT_ALIGNOF_CORBA_STRUCT = @ORBIT_ALIGNOF_CORBA_STRUCT@
  27. ORBIT_ALIGNOF_CORBA_WCHAR = @ORBIT_ALIGNOF_CORBA_WCHAR@
  28. ORBIT_CFLAGS = @ORBIT_CFLAGS@
  29. -ORBIT_IDL_CFLAGS = @ORBIT_IDL_CFLAGS@
  30. -ORBIT_IDL_LIBS = @ORBIT_IDL_LIBS@
  31. +ORBIT_IDL_CFLAGS =
  32. +ORBIT_IDL_LIBS =
  33. ORBIT_LIBS = @ORBIT_LIBS@
  34. ORBIT_MAJOR_VERSION = @ORBIT_MAJOR_VERSION@
  35. ORBIT_MICRO_VERSION = @ORBIT_MICRO_VERSION@
  36. @@ -199,7 +197,7 @@ PACKAGE_URL = @PACKAGE_URL@
  37. PACKAGE_VERSION = @PACKAGE_VERSION@
  38. PATH_SEPARATOR = @PATH_SEPARATOR@
  39. PKG_CONFIG = @PKG_CONFIG@
  40. -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
  41. +PKG_CONFIG_LIBDIR = $(PKG_HOSTLIB_DIR)
  42. PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
  43. RANLIB = @RANLIB@
  44. SED = @SED@
  45. @@ -270,8 +268,7 @@ INCLUDES = \
  46. -DVERSION=\"$(ORBIT_VERSION)\" \
  47. -DORBIT2_INTERNAL_API \
  48. $(WARN_CFLAGS) \
  49. - $(DISABLE_DEPRECATED_CFLAGS) \
  50. - $(ORBIT_IDL_CFLAGS)
  51. + $(DISABLE_DEPRECATED_CFLAGS)
  52. orbit_idl_2_LDADD = \
  53. $(ORBIT_IDL_LIBS) \