+2007-05-31 Jason Rumney <jasonr@gnu.org>
+
+ * makefile.w32-in (font.o, w32font.o): New objects.
+ (fontset.o, xdisp.o, xfaces.o, w32fns.o, w32term.o): Depend on font.h
+ (FONTOBJ): New group of objects conditioned on USE_FONT_BACKEND.
+
2007-05-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xdisp.c (redisplay_internal): Bind inhibit-point-motion-hooks to t
$(BLD)/w32reg.$(O) \
$(BLD)/w32bdf.$(O)
+FONTOBJ =
+ifdef USE_FONTBACKEND
+FONTOBJ = $(BLD)/font.$(O) \
+ $(BLD)/w32font.$(O)
+endif
+
LIBS = $(TLIB0) \
$(TLIB1) \
$(TLIBW32) \
echo $(OBJ0) > $(BLD)/buildobj.lst
echo $(OBJ1) >> $(BLD)/buildobj.lst
echo $(WIN32OBJ) >> $(BLD)/buildobj.lst
+ echo $(FONTOBJ) >> $(BLD)/buildobj.lst
bootstrap: bootstrap-emacs
$(TLIB1): $(OBJ1)
- $(DEL) $@
$(AR) $(AR_OUT)$@ $(ALL_DEPS)
-$(TLIBW32): $(WIN32OBJ)
+$(TLIBW32): $(WIN32OBJ) $(FONTOBJ)
- $(DEL) $@
$(AR) $(AR_OUT)$@ $(ALL_DEPS)
$(SRC)/w32gui.h \
$(SRC)/window.h
+$(BLD)/font.$(O) : \
+ $(SRC)/font.c \
+ $(EMACS_ROOT)/src/s/ms-w32.h \
+ $(EMACS_ROOT)/src/m/intel386.h \
+ $(EMACS_ROOT)/src/config.h \
+ $(SRC)/dispextern.h \
+ $(SRC)/frame.h \
+ $(SRC)/window.h \
+ $(SRC)/ccl.h \
+ $(SRC)/character.h \
+ $(SRC)/charset.h \
+ $(SRC)/font.h
+
$(BLD)/fontset.$(O) : \
$(SRC)/fontset.c \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(SRC)/character.h \
$(SRC)/charset.h \
$(SRC)/dispextern.h \
+ $(SRC)/font.h \
$(SRC)/fontset.h \
$(SRC)/frame.h \
$(SRC)/keyboard.h \
$(SRC)/composite.h \
$(SRC)/dispextern.h \
$(SRC)/disptab.h \
+ $(SRC)/font.h \
$(SRC)/fontset.h \
$(SRC)/frame.h \
$(SRC)/indent.h \
$(SRC)/charset.h \
$(SRC)/composite.h \
$(SRC)/dispextern.h \
+ $(SRC)/font.h \
$(SRC)/fontset.h \
$(SRC)/frame.h \
$(SRC)/intervals.h \
$(SRC)/composite.h \
$(SRC)/dispextern.h \
$(SRC)/epaths.h \
+ $(SRC)/font.h \
$(SRC)/fontset.h \
$(SRC)/frame.h \
$(SRC)/intervals.h \
$(SRC)/composite.h \
$(SRC)/dispextern.h \
$(SRC)/disptab.h \
+ $(SRC)/font.h \
$(SRC)/fontset.h \
$(SRC)/frame.h \
$(SRC)/gnu.h \
$(SRC)/w32gui.h \
$(SRC)/w32term.h
+$(BLD)/w32font$(O): \
+ $(SRC)/w32font.c \
+ $(EMACS_ROOT)/src/s/ms-w32.h \
+ $(EMACS_ROOT)/src/m/intel386.h \
+ $(EMACS_ROOT)/src/config.h \
+ $(SRC)/character.h \
+ $(SRC)/charset.h \
+ $(SRC)/dispextern.h \
+ $(SRC)/font.h \
+ $(SRC)/fontset.h \
+ $(SRC)/frame.h \
+ $(SRC)/w32gui.h \
+ $(SRC)/w32term.h
+
# Each object file depends on stamp_BLD, because in parallel builds we must
# make sure $(BLD) exists before starting compilations.
#
-$(OBJ0) $(OBJ1) $(WIN32OBJ) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD
+$(OBJ0) $(OBJ1) $(WIN32OBJ) $(FONTOBJ) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD