From 08411a96ec1c25970b0d63db7b5d061329562fdf Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 15 Oct 2006 21:24:47 +0000
Subject: reorder makefile to allow config.mak to add srcs; also use libs from
 config.mak (this allows using -lutf8_plug on old broken systems, etc)

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c241cf8..9dfc429 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 
 
 SRCS = main.c term.c comb.c decomp.c tty.c alloc.c refresh.c ascii.c ucf.c font_load.c
-OBJS = $(SRCS:.c=.o)
 
 OBJS_FB = fbcon.o dblbuf.o
 OBJS_X11 = xlib.o
@@ -12,19 +11,20 @@ ALL = uuterm-x11 uuterm-fb
 
 CFLAGS = -O2 -s #-g
 LDFLAGS = -s
-LIBS = -L/usr/X11R6/lib -lX11
 
 -include config.mak
 
+OBJS = $(SRCS:.c=.o)
+
 all: $(ALL)
 
 $(OBJS) $(OBJS_FB) $(OBJS_X11): uuterm.h
 
 uuterm-fb: $(OBJS) $(OBJS_FB)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(OBJS_FB)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(OBJS_FB) $(LIBS)
 
 uuterm-x11: $(OBJS) $(OBJS_X11)
-	$(CC) $(LDFLAGS) $(LDFLAGS_X11) -o $@ $(OBJS) $(OBJS_X11) -lX11
+	$(CC) $(LDFLAGS) $(LDFLAGS_X11) -o $@ $(OBJS) $(OBJS_X11) -lX11 $(LIBS)
 
 clean:
 	rm -f $(OBJS) $(OBJS_FB) $(OBJS_X11) uuterm-fb uuterm-x11
-- 
cgit v1.2.3