patch-tools_rpcgen_Makefile_in 2.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475
  1. --- nfs-utils-1.2.3.orig/tools/rpcgen/Makefile.in 2010-09-28 14:32:33.000000000 +0200
  2. +++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in 2011-02-06 16:48:47.000000000 +0100
  3. @@ -72,21 +72,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
  4. rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
  5. rpcgen_LDADD = $(LDADD)
  6. rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  7. - --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
  8. - $(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
  9. + --mode=link $(CCLD) $(rpcgen_CFLAGS) \
  10. + $(rpcgen_LDFLAGS) -o $@
  11. DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
  12. depcomp = $(SHELL) $(top_srcdir)/depcomp
  13. am__depfiles_maybe = depfiles
  14. am__mv = mv -f
  15. -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  16. - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  17. +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  18. + $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
  19. LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  20. --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  21. - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  22. + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  23. CCLD = $(CC)
  24. LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  25. - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  26. - $(LDFLAGS) -o $@
  27. + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) \
  28. + -o $@
  29. SOURCES = $(rpcgen_SOURCES)
  30. DIST_SOURCES = $(rpcgen_SOURCES)
  31. ETAGS = etags
  32. @@ -97,7 +97,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
  33. ALLOCA = @ALLOCA@
  34. AMTAR = @AMTAR@
  35. AM_CFLAGS = @AM_CFLAGS@
  36. -AM_CPPFLAGS = @AM_CPPFLAGS@
  37. +AM_CPPFLAGS =
  38. AR = @AR@
  39. AUTOCONF = @AUTOCONF@
  40. AUTOHEADER = @AUTOHEADER@
  41. @@ -106,10 +106,10 @@ AWK = @AWK@
  42. CC = $(CC_FOR_BUILD)
  43. CCDEPMODE = @CCDEPMODE@
  44. CC_FOR_BUILD = @CC_FOR_BUILD@
  45. -CFLAGS = @CFLAGS@
  46. +CFLAGS =
  47. CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  48. CPP = @CPP@
  49. -CPPFLAGS = @CPPFLAGS@
  50. +CPPFLAGS =
  51. CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
  52. CXX = @CXX@
  53. CXXCPP = @CXXCPP@
  54. @@ -142,10 +142,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
  55. K5VERS = @K5VERS@
  56. KRBCFLAGS = @KRBCFLAGS@
  57. KRBDIR = @KRBDIR@
  58. -KRBLDFLAGS = @KRBLDFLAGS@
  59. +KRBLDFLAGS =
  60. KRBLIBS = @KRBLIBS@
  61. LD = @LD@
  62. -LDFLAGS = @LDFLAGS@
  63. +LDFLAGS =
  64. LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  65. LIBBLKID = @LIBBLKID@
  66. LIBBSD = @LIBBSD@
  67. @@ -308,7 +308,7 @@ clean-noinstPROGRAMS:
  68. rm -f $$list
  69. rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES)
  70. @rm -f rpcgen$(EXEEXT)
  71. - $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
  72. + $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
  73. mostlyclean-compile:
  74. -rm -f *.$(OBJEXT)