patch-src_util_Makefile_in 4.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. --- libX11-1.3.2.orig/src/util/Makefile.in 2009-10-23 22:55:44.000000000 +0200
  2. +++ libX11-1.3.2/src/util/Makefile.in 2009-11-20 08:55:51.000000000 +0100
  3. @@ -58,7 +58,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERB
  4. am__v_lt_0 = --silent
  5. makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  6. $(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \
  7. - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  8. + $(CFLAGS) $(AM_LDFLAGS) $(HOSTLDFLAGS) -o $@
  9. DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  10. depcomp = $(SHELL) $(top_srcdir)/depcomp
  11. am__depfiles_maybe = depfiles
  12. @@ -103,7 +103,7 @@ BIGFONT_LIBS = @BIGFONT_LIBS@
  13. CC = @CC_FOR_BUILD@
  14. CCDEPMODE = @CCDEPMODE@
  15. CC_FOR_BUILD = @CC_FOR_BUILD@
  16. -CFLAGS = @CFLAGS@
  17. +CFLAGS =
  18. CHANGELOG_CMD = @CHANGELOG_CMD@
  19. CPP = @CPP@
  20. CPPFLAGS = @CPPFLAGS@
  21. @@ -139,9 +139,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
  22. INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  23. KEYSYMDEF = @KEYSYMDEF@
  24. LAUNCHD = @LAUNCHD@
  25. -LDFLAGS = @LDFLAGS@
  26. +LDFLAGS =
  27. LIBOBJS = @LIBOBJS@
  28. -LIBS = @LIBS@
  29. +LIBS =
  30. LIBTOOL = @LIBTOOL@
  31. LIB_MAN_DIR = @LIB_MAN_DIR@
  32. LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
  33. @@ -256,7 +256,8 @@ target_alias = @target_alias@
  34. top_build_prefix = @top_build_prefix@
  35. top_builddir = @top_builddir@
  36. top_srcdir = @top_srcdir@
  37. -makekeys_CFLAGS = $(X11_CFLAGS)
  38. +makekeys_CFLAGS = $(HOSTCFLAGS)
  39. +makekeys_CPPFLAGS = $(HOSTCPPFLAGS)
  40. EXTRA_DIST = mkks.sh
  41. # Check source code with tools like lint & sparse
  42. @@ -343,20 +344,20 @@ distclean-compile:
  43. @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
  44. makekeys-makekeys.o: makekeys.c
  45. -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
  46. +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
  47. @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
  48. @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
  49. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
  50. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  51. -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
  52. +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
  53. makekeys-makekeys.obj: makekeys.c
  54. -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
  55. +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
  56. @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
  57. @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
  58. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@
  59. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  60. -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
  61. +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makekeys_CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
  62. mostlyclean-libtool:
  63. -rm -f *.lo