patch-src_util_Makefile_in 2.4 KB

123456789101112131415161718192021222324252627282930313233343536
  1. --- libX11-1.4.0.orig/src/util/Makefile.in 2010-11-21 23:15:55.000000000 +0100
  2. +++ libX11-1.4.0/src/util/Makefile.in 2011-10-21 09:41:05.000000000 +0200
  3. @@ -143,7 +143,7 @@ LD = @LD@
  4. LDFLAGS = @LDFLAGS_FOR_BUILD@
  5. LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  6. LIBOBJS = @LIBOBJS@
  7. -LIBS = @LIBS@
  8. +LIBS =
  9. LIBTOOL = @LIBTOOL@
  10. LIB_MAN_DIR = @LIB_MAN_DIR@
  11. LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
  12. @@ -262,8 +262,7 @@ top_build_prefix = @top_build_prefix@
  13. top_builddir = @top_builddir@
  14. top_srcdir = @top_srcdir@
  15. makekeys_CFLAGS = \
  16. - $(X11_CFLAGS) \
  17. - $(CWARNFLAGS)
  18. + $(CWARNFLAGS) -I/usr/local/include
  19. EXTRA_DIST = mkks.sh
  20. @@ -351,12 +350,12 @@ distclean-compile:
  21. @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
  22. makekeys-makekeys.o: makekeys.c
  23. -@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
  24. +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
  25. @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
  26. @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
  27. @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
  28. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  29. -@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
  30. +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
  31. makekeys-makekeys.obj: makekeys.c
  32. @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`