7837a7d329
- Completely revamped the PSF font import/export system to make it actually useable. - Changed to use FreeType 2. - Miscellaneous fixes.
77 lines
2.6 KiB
Plaintext
77 lines
2.6 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.1 2004/04/05 21:41:46 naddy Exp $
|
|
--- Makefile.orig 2004-02-17 16:24:06.000000000 +0100
|
|
+++ Makefile 2004-03-18 18:37:07.000000000 +0100
|
|
@@ -22,8 +22,8 @@
|
|
#
|
|
# $Id: patch-Makefile,v 1.1 2004/04/05 21:41:46 naddy Exp $
|
|
#
|
|
-CC = gcc
|
|
-CFLAGS = -g -Wall
|
|
+#CC = gcc
|
|
+#CFLAGS = -g -Wall
|
|
|
|
OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
|
|
xmbdfedrc xmbdfed.man
|
|
@@ -46,17 +46,17 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
|
|
# Uncomment these if you have the FreeType library and want to use it to
|
|
# import OpenType fonts.
|
|
#
|
|
-#FTYPE_INCS = -I/usr/local/include
|
|
-#FTYPE_LIBS = -L/usr/local/lib -lfreetype
|
|
-#FTYPE_DEFS = -DHAVE_FREETYPE
|
|
+FTYPE_INCS = -I${X11BASE}/include/freetype2
|
|
+FTYPE_LIBS = -L${X11BASE}/lib -lfreetype
|
|
+FTYPE_DEFS = -DHAVE_FREETYPE
|
|
|
|
#
|
|
# Uncomment these if you have the hbf.h and hbf.c files in the current
|
|
# directory and the patch has been applied.
|
|
#
|
|
-#HBF_HDRS = hbf.h
|
|
-#HBF_OBJS = hbf.o
|
|
-#HBF_DEFS = -DHAVE_HBF
|
|
+HBF_HDRS = hbf.h
|
|
+HBF_OBJS = hbf.o
|
|
+HBF_DEFS = -DHAVE_HBF
|
|
|
|
#
|
|
# Specify the various defines needed for HBF fonts. If you do not have GNU
|
|
@@ -64,7 +64,7 @@ OBJS = FGrid.o GEdit.o GEditTB.o GTest.o
|
|
# files with a ".gz" extension. If you don't care about HBF fonts, just
|
|
# comment this line out.
|
|
#
|
|
-HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
|
|
+HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""
|
|
|
|
#
|
|
# Set the defines used for all files except the HBF support.
|
|
@@ -82,9 +82,9 @@ DEFS = -DHAVE_XLIB $(FTYPE_DEFS) $(HBF_D
|
|
#
|
|
# Uncomment these for Solaris.
|
|
#
|
|
-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
|
|
-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
|
|
- -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
|
|
+#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
|
|
+#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
|
|
+# -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
|
|
|
|
#
|
|
# Uncomment these for Linux.
|
|
@@ -129,10 +129,14 @@ LIBS = -R/usr/openwin/lib -R/usr/dt/lib
|
|
#LIBS = -L/usr/Motif-1.2/lib32 -lXm \
|
|
# -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
|
|
|
|
+INCS= -I${X11BASE}/include -I${LOCALBASE}/include ${FTYPE_INCS}
|
|
+LIBS= -L${X11BASE}/lib -L${LOCALBASE}/lib \
|
|
+ ${MOTIFLIB} -lXp -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE ${FTYPE_LIBS}
|
|
+
|
|
all: xmbdfed
|
|
|
|
xmbdfed: $(OBJS)
|
|
- $(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)
|
|
+ $(PURIFY) $(CC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS)
|
|
|
|
hbf.o: hbf.c
|
|
$(CC) $(CFLAGS) $(DEFS) $(HBFDEFS) $(INCS) -c $< -o $@
|