Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier

diff --cc src/Makefile.am
index 62ca146,f9a4805..65b80c2
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -139,8 -111,10 +139,10 @@@ EXTRA_hengband_SOURCES = 
  EXTRA_DIST = \
        gcc-wrap
  
+ CFLAGS += $(XFT_CFLAGS)
+ LIBS += $(XFT_LIBS)
  COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 -      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -Icmd -Icombat
 +      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -Icmd -Icombat -Iio -Iplayer -Iview
  
  install-exec-hook:
  if SET_GID

diff --cc src/h-config.h
Simple merge