diff options
| author | Toomas Soome <tsoome@me.com> | 2017-02-01 08:56:36 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-02-12 23:11:45 +0200 |
| commit | cbc8e155c29643fa0d62159c2d3dee078ed6cc91 (patch) | |
| tree | 81b5ea5a1d03f8c0057352e982d52bd5011eb39e /usr/src/uts/common/Makefile.rules | |
| parent | c9aaca5d3825256aa6c09cc34e4ce5640630341b (diff) | |
| download | illumos-joyent-cbc8e155c29643fa0d62159c2d3dee078ed6cc91.tar.gz | |
10355 uts: new-font project. Use terminus Unicode fonts for console.
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/common/Makefile.rules')
| -rw-r--r-- | usr/src/uts/common/Makefile.rules | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules index 3dceec9a52..37588ed5d5 100644 --- a/usr/src/uts/common/Makefile.rules +++ b/usr/src/uts/common/Makefile.rules @@ -206,16 +206,14 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/common/exec/java/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -$(OBJS_DIR)/$(VGATEXT_FONT).c: $(VGATEXT_FONT_DIR)/$(VGATEXT_FONT_SRC).bdf \ - $(VGATEXT_FONT_DIR)/bdf_to_c.awk - $(AWK) -f $(VGATEXT_FONT_DIR)/bdf_to_c.awk \ - $(VGATEXT_FONT_DIR)/$(VGATEXT_FONT_SRC).bdf > $@ +$(OBJS_DIR)/$(FONT).c: $(FONT_DIR)/$(FONT_SRC).bdf + $(VTFONTCVT) -f source -o $@ $(FONT_DIR)/$(FONT_SRC).bdf -$(OBJS_DIR)/$(VGATEXT_FONT).o: $(OBJS_DIR)/$(VGATEXT_FONT).c +$(OBJS_DIR)/$(FONT).o: $(OBJS_DIR)/$(FONT).c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) -$(OBJS_DIR)/%.o: $(UTSBASE)/common/font/%.c +$(OBJS_DIR)/%.o: $(SRC)/common/font/%.c $(COMPILE.c) -o $@ $< $(CTFCONVERT_O) @@ -1956,7 +1954,7 @@ $(LINTS_DIR)/%.ln: $(UTSBASE)/common/inet/dlpistub/%.c $(LINTS_DIR)/%.ln: $(UTSBASE)/common/io/%.c @($(LHEAD) $(LINT.c) $< $(LTAIL)) -$(LINTS_DIR)/%.ln: $(UTSBASE)/common/font/%.c +$(LINTS_DIR)/%.ln: $(SRC)/common/font/%.c @($(LHEAD) $(LINT.c) $< $(LTAIL)) $(LINTS_DIR)/%.ln: $(UTSBASE)/common/io/1394/%.c |