patch-util_Makefile_in 4.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- libXt-1.0.5.orig/util/Makefile.in 2007-01-28 07:31:13.000000000 +0100
  3. +++ libXt-1.0.5/util/Makefile.in 2009-06-13 11:34:25.000000000 +0200
  4. @@ -92,11 +92,11 @@ AUTOCONF = @AUTOCONF@
  5. AUTOHEADER = @AUTOHEADER@
  6. AUTOMAKE = @AUTOMAKE@
  7. AWK = @AWK@
  8. -CC = @CC@
  9. +CC = $(HOSTCC)
  10. CCDEPMODE = @CCDEPMODE@
  11. -CFLAGS = @CFLAGS@
  12. +CFLAGS = $(HOSTCFLAGS)
  13. CPP = @CPP@
  14. -CPPFLAGS = @CPPFLAGS@
  15. +CPPFLAGS = $(HOSTCPPFLAGS)
  16. CXX = @CXX@
  17. CXXCPP = @CXXCPP@
  18. CXXDEPMODE = @CXXDEPMODE@
  19. @@ -123,7 +123,7 @@ INSTALL_MAKESTRS_TRUE = @INSTALL_MAKESTR
  20. INSTALL_PROGRAM = @INSTALL_PROGRAM@
  21. INSTALL_SCRIPT = @INSTALL_SCRIPT@
  22. INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  23. -LDFLAGS = @LDFLAGS@
  24. +LDFLAGS = $(HOSTLDFLAGS)
  25. LIBOBJS = @LIBOBJS@
  26. LIBS = @LIBS@
  27. LIBTOOL = @LIBTOOL@
  28. @@ -209,8 +209,9 @@ sharedstatedir = @sharedstatedir@
  29. sysconfdir = @sysconfdir@
  30. target_alias = @target_alias@
  31. EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
  32. -makestrs_CFLAGS = $(XT_CFLAGS)
  33. +makestrs_CFLAGS = $(CFLAGS)
  34. makestrs_SOURCES = makestrs.c
  35. +makestrs_CPPFLAGS = $(HOSTCPPFLAGS)
  36. # Man page
  37. appmandir = $(APP_MAN_DIR)
  38. @@ -329,18 +330,18 @@ distclean-compile:
  39. @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
  40. makestrs-makestrs.o: makestrs.c
  41. -@am__fastdepCC_TRUE@ if $(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; \
  42. +@am__fastdepCC_TRUE@ if $(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; \
  43. @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
  44. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
  45. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  46. -@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
  47. +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
  48. makestrs-makestrs.obj: makestrs.c
  49. -@am__fastdepCC_TRUE@ if $(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`; \
  50. +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(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`; \
  51. @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
  52. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
  53. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  54. -@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`
  55. +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(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`
  56. mostlyclean-libtool:
  57. -rm -f *.lo