patch-tools_locktest_Makefile_in 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. --- nfs-utils-1.2.3.orig/tools/locktest/Makefile.in 2010-09-28 14:32:32.000000000 +0200
  2. +++ nfs-utils-1.2.3/tools/locktest/Makefile.in 2010-12-24 15:40:35.000000000 +0100
  3. @@ -67,20 +67,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
  4. testlk_OBJECTS = $(am_testlk_OBJECTS)
  5. testlk_LDADD = $(LDADD)
  6. testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  7. - --mode=link $(CCLD) $(testlk_CFLAGS) $(CFLAGS) \
  8. - $(testlk_LDFLAGS) $(LDFLAGS) -o $@
  9. + --mode=link $(CCLD) $(testlk_CFLAGS) \
  10. + $(testlk_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. + $(CPPFLAGS) $(AM_CFLAGS)
  18. LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  19. --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  20. - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  21. + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
  22. CCLD = $(CC)
  23. LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  24. - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  25. + --mode=link $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) \
  26. $(LDFLAGS) -o $@
  27. SOURCES = $(testlk_SOURCES)
  28. DIST_SOURCES = $(testlk_SOURCES)
  29. @@ -101,15 +101,15 @@ AWK = @AWK@
  30. CC = $(CC_FOR_BUILD)
  31. CCDEPMODE = @CCDEPMODE@
  32. CC_FOR_BUILD = @CC_FOR_BUILD@
  33. -CFLAGS = @CFLAGS@
  34. +CFLAGS =
  35. CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  36. CPP = @CPP@
  37. -CPPFLAGS = @CPPFLAGS@
  38. +CPPFLAGS =
  39. CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
  40. CXX = @CXX@
  41. CXXCPP = @CXXCPP@
  42. CXXDEPMODE = @CXXDEPMODE@
  43. -CXXFLAGS = @CXXFLAGS@
  44. +CXXFLAGS =
  45. CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
  46. CYGPATH_W = @CYGPATH_W@
  47. DEFS = @DEFS@