diff options
-rw-r--r-- | rules.mk | 3 | ||||
-rw-r--r-- | src/cmd/cc/rules.mk | 2 | ||||
-rw-r--r-- | src/cmd/core/rules.mk | 8 | ||||
-rw-r--r-- | src/cmd/dwm/config.h | 2 | ||||
-rw-r--r-- | src/cmd/dwm/rules.mk | 2 | ||||
-rw-r--r-- | src/cmd/filter/rules.mk | 2 | ||||
-rw-r--r-- | src/cmd/ic/rules.mk | 2 | ||||
-rw-r--r-- | src/cmd/menu/config.h | 2 | ||||
-rw-r--r-- | src/cmd/rc/rules.mk | 2 | ||||
-rw-r--r-- | src/cmd/term/config.h | 4 | ||||
-rw-r--r-- | src/cmd/term/rules.mk | 2 | ||||
-rw-r--r-- | src/cmd/walk/rules.mk | 2 |
12 files changed, 15 insertions, 18 deletions
@@ -53,6 +53,7 @@ $(TST_DIR)/%: $(SRC_DIR)/%.c $(COMPLINK) # iterate through source directory tree +LIBBASE := $(OBJ_DIR)/base/base.a $(SYS) DIR := src include $(DIR)/rules.mk @@ -68,7 +69,7 @@ clean: @rm -f $(OBJS) @echo removing dependency files @rm -f $(DEPS) - @echo removing generated source files + @echo removing generated source files @rm -f $(GENS) @echo removing libraries @rm -f $(LIBS) diff --git a/src/cmd/cc/rules.mk b/src/cmd/cc/rules.mk index b7b4688..1658d18 100644 --- a/src/cmd/cc/rules.mk +++ b/src/cmd/cc/rules.mk @@ -15,7 +15,7 @@ BINS_$(d) := $(d)/cc include share/paths.mk # Local rules -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libn/libn.a +$(BINS_$(d)): $(OBJS_$(d)) $(LIBBASE) $(COMPLINK) include share/pop.mk diff --git a/src/cmd/core/rules.mk b/src/cmd/core/rules.mk index 9c4eb76..2c12707 100644 --- a/src/cmd/core/rules.mk +++ b/src/cmd/core/rules.mk @@ -5,15 +5,11 @@ BINS_$(d):=\ $(d)/cat include share/paths.mk -libbase:=\ - $(OBJ_DIR)/libfmt/libfmt.a\ - $(OBJ_DIR)/libutf/libutf.a\ - $(OBJ_DIR)/base/base.a -$(o)/basename: $(d)/basename.c $(libbase) +$(o)/basename: $(d)/basename.c $(LIBBASE) $(COMPLINK) -$(o)/cat: $(d)/cat.c $(libbase) +$(o)/cat: $(d)/cat.c $(LIBBASE) $(COMPLINK) include share/pop.mk diff --git a/src/cmd/dwm/config.h b/src/cmd/dwm/config.h index 1f82b1f..3839cbf 100644 --- a/src/cmd/dwm/config.h +++ b/src/cmd/dwm/config.h @@ -8,7 +8,7 @@ static uint snap = 32; /* snap pixel */ static int swallowfloating = 0; /* 1 will swallow floating by default */ static int showbar = 1; /* 0 means no bar */ static int topbar = 1; /* 0 means bottom bar */ -static char *fonts[] = { "consolas:size=16" }; +static char *fonts[] = { "consolas:size=12" }; static char col_gray1[] = "#504945"; static char col_gray2[] = "#282828"; static char col_gray3[] = "#fbf1c7"; diff --git a/src/cmd/dwm/rules.mk b/src/cmd/dwm/rules.mk index ddf5dd8..d03b7b9 100644 --- a/src/cmd/dwm/rules.mk +++ b/src/cmd/dwm/rules.mk @@ -23,7 +23,7 @@ $(BINS_$(d)): TLIBS=\ `$(PKG) --libs freetype2`\ -lX11 -lXinerama -lXft -lX11-xcb -lxcb -lxcb-res -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libutf/libutf.a $(OBJ_DIR)/base/base.a +$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/base/base.a $(COMPLINK) include share/pop.mk diff --git a/src/cmd/filter/rules.mk b/src/cmd/filter/rules.mk index 13ddd56..38daf16 100644 --- a/src/cmd/filter/rules.mk +++ b/src/cmd/filter/rules.mk @@ -8,7 +8,7 @@ BINS_$(d):=$(d)/filter include share/paths.mk # Local rules -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/base/base.a +$(BINS_$(d)): $(OBJS_$(d)) $(LIBBASE) $(COMPLINK) include share/pop.mk diff --git a/src/cmd/ic/rules.mk b/src/cmd/ic/rules.mk index d001c01..1376aef 100644 --- a/src/cmd/ic/rules.mk +++ b/src/cmd/ic/rules.mk @@ -8,7 +8,7 @@ BINS_$(d):=$(d)/ic include share/paths.mk # Local rules -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/base/base.a +$(BINS_$(d)): $(OBJS_$(d)) $(LIBBASE) $(COMPLINK) include share/pop.mk diff --git a/src/cmd/menu/config.h b/src/cmd/menu/config.h index 9bfd5b3..fb1614d 100644 --- a/src/cmd/menu/config.h +++ b/src/cmd/menu/config.h @@ -5,7 +5,7 @@ static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ /* -fn option overrides fonts[0]; default X11 font or font set */ static const char *fonts[] = { - "consolas:size=16" + "consolas:size=12" }; static const char *prompt = "cmds"; /* -p option; prompt to the left of input field */ diff --git a/src/cmd/rc/rules.mk b/src/cmd/rc/rules.mk index 0758439..1db34bd 100644 --- a/src/cmd/rc/rules.mk +++ b/src/cmd/rc/rules.mk @@ -27,7 +27,7 @@ $(d)/parse.h $(d)/parse.c: $(d)/syntax.y bison --defines=$(<D)/parse.h --output=$(<D)/parse.c $(<) # local rules -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libutf/libutf.a $(OBJ_DIR)/base/base.a $(d)/parse.h +$(BINS_$(d)): $(OBJS_$(d)) $(LIBBASE) $(d)/parse.h $(COMPLINK) include share/pop.mk diff --git a/src/cmd/term/config.h b/src/cmd/term/config.h index a740ecf..c902597 100644 --- a/src/cmd/term/config.h +++ b/src/cmd/term/config.h @@ -6,7 +6,7 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "consolas:size=16"; +static char *font = "consolas:size=12"; static int borderpx = 2; /* @@ -17,7 +17,7 @@ static int borderpx = 2; * 4: value of shell in /etc/passwd * 5: value of shell in config.h */ -static char *shell = "/bin/mksh"; +static char *shell = "/bin/bash"; char *utmp = nil; /* scroll program: to enable use a string like "scroll" */ char *scroll = nil; diff --git a/src/cmd/term/rules.mk b/src/cmd/term/rules.mk index 9bf619c..bc0500a 100644 --- a/src/cmd/term/rules.mk +++ b/src/cmd/term/rules.mk @@ -20,7 +20,7 @@ $(BINS_$(d)): TLIBS=\ `$(PKG) --libs freetype2`\ -lm -lrt -lX11 -lutil -lXft -lXrender #-lharfbuzz -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/libutf/libutf.a $(OBJ_DIR)/base/base.a +$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/base/base.a $(COMPLINK) include share/pop.mk diff --git a/src/cmd/walk/rules.mk b/src/cmd/walk/rules.mk index cb9768c..ff52179 100644 --- a/src/cmd/walk/rules.mk +++ b/src/cmd/walk/rules.mk @@ -9,7 +9,7 @@ BINS_$(d):=$(d)/walk include share/paths.mk # Local rules -$(BINS_$(d)): $(OBJS_$(d)) $(OBJ_DIR)/base/base.a +$(BINS_$(d)): $(OBJS_$(d)) $(LIBBASE) $(COMPLINK) include share/pop.mk |