patch-util_Makefile_in 4.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. --- libXt-1.0.7.orig/util/Makefile.in 2009-10-09 06:51:17.000000000 +0200
  2. +++ libXt-1.0.7/util/Makefile.in 2010-02-05 23:31:14.324191435 +0100
  3. @@ -63,10 +63,10 @@ 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. +COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  9. $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  10. LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  11. - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
  12. + $(LIBTOOLFLAGS) --mode=compile $(CC_FOR_BUILD) $(DEFS) \
  13. $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
  14. $(AM_CFLAGS) $(CFLAGS)
  15. AM_V_CC = $(am__v_CC_$(V))
  16. @@ -75,7 +75,7 @@ am__v_CC_0 = @echo " CC " $@;
  17. AM_V_at = $(am__v_at_$(V))
  18. am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
  19. am__v_at_0 = @
  20. -CCLD = $(CC)
  21. +CCLD = $(CC_FOR_BUILD)
  22. LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  23. $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  24. $(AM_LDFLAGS) $(LDFLAGS) -o $@
  25. @@ -131,7 +131,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
  26. CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  27. CHANGELOG_CMD = @CHANGELOG_CMD@
  28. CPP = @CPP@
  29. -CPPFLAGS = @CPPFLAGS@
  30. +CPPFLAGS =
  31. CWARNFLAGS = @CWARNFLAGS@
  32. CXX = @CXX@
  33. CXXCPP = @CXXCPP@
  34. @@ -253,7 +253,8 @@ top_build_prefix = @top_build_prefix@
  35. top_builddir = @top_builddir@
  36. top_srcdir = @top_srcdir@
  37. EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
  38. -makestrs_CFLAGS = $(XT_CFLAGS)
  39. +makestrs_CFLAGS = $(HOSTCFLAGS)
  40. +makestrs_CPPFLAGS = $(HOSTCPPFLAGS)
  41. makestrs_SOURCES = makestrs.c
  42. # Man page
  43. @@ -393,20 +394,20 @@ distclean-compile:
  44. @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
  45. makestrs-makestrs.o: makestrs.c
  46. -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
  47. +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
  48. @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
  49. @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
  50. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
  51. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  52. -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
  53. +@am__fastdepCC_FALSE@ $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
  54. makestrs-makestrs.obj: makestrs.c
  55. -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
  56. +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
  57. @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
  58. @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
  59. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
  60. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  61. -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
  62. +@am__fastdepCC_FALSE@ $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
  63. mostlyclean-libtool:
  64. -rm -f *.lo