summaryrefslogtreecommitdiff
path: root/misc/alevt/files/patch-aa
blob: 23bdb58d8a27adc4273e9bb5381dd651cdb1d5be (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
--- Makefile.orig	2007-12-03 05:19:54.000000000 +0000
+++ Makefile	2008-04-30 12:36:24.000000000 +0000
@@ -1,37 +1,40 @@
 VER=1.6.2
-OPT=-O2 -s -w
-#OPT=-O -g
+
+.if defined(WITH_PNG)
 DEFS=-DWITH_PNG
+PNG_LIBS=-L${LOCALBASE}/lib -lpng -lz -lm
+.endif
+
+.if defined(WITH_SMALLFONT)
+FONT=neep9
+.else
 FONT=vtxt
-USR_X11R6=/usr/X11R6
+.endif
+
+USR_X11R6=/usr/local
 #USR_X11R6=/usr
 MAN_DIR=man
 #MAN_DIR=share/man
 HOSTCC=$(CC)
-# a smaller and thinner font
-#FONT=neep9
 
-CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
+CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS) -I${LOCALBASE}/include -W
+X11_LIBS=-L${LOCALBASE}/lib -lX11
 
 EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
 OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
 TOBJS=alevt-date.o vbi.o fdset.o misc.o hamm.o lang.o
 COBJS=alevt-cap.o vbi.o fdset.o misc.o hamm.o lang.o $(EXPOBJS)
 
-ifneq ($(findstring WITH_PNG,$(DEFS)),)
-EXPLIBS=-lpng -lz -lm
-endif
-
 all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
 
 alevt: $(OBJS)
-	$(CC) $(OPT) $(OBJS) -o alevt -L$(USR_X11R6)/lib -L$(USR_X11R6)/lib64 -lX11 $(EXPLIBS)
+	$(CC) $(CFLAGS) $(OBJS) -o alevt $(PNG_LIBS) $(X11_LIBS)
 
 alevt-date: $(TOBJS)
-	$(CC) $(OPT) $(TOBJS) -o alevt-date
+	$(CC) $(CFLAGS) $(TOBJS) -o alevt-date
 
 alevt-cap: $(COBJS)
-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
+	$(CC) $(CFLAGS) $(COBJS) -o alevt-cap $(PNG_LIBS)
 
 font.o: font1.xbm font2.xbm
 fontsize.h: font1.xbm font2.xbm