[stsf-commit] stsf/STFontServer/src makefile, 1.7, 1.8 stfs-door.c, 1.6, 1.7

Alexander Gelfenbain stsf-commit at pdx.freedesktop.org
Wed May 26 21:26:54 PDT 2004


Committed by: adg


Index: makefile
===================================================================
RCS file: /cvs/stsf/stsf/STFontServer/src/makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/makefile	25 May 2004 02:47:24 -0000	1.7
+++ b/makefile	27 May 2004 04:26:52 -0000	1.8
@@ -100,7 +100,7 @@
 
 
 
-DEFINES+= -DCACHE_STATISTICS -DDEFAULT_SCALER_PATH=\"$(DEFAULT_SCALER_PATH)\"
+DEFINES+= -DCACHE_STATISTICS -DDEFAULT_SCALER_PATH=\"$(DEFAULT_SCALER_PATH)\" $(FONTCONFIG_CFLAGS)
 
 fontmanager: DEFINES+= -DDEBUG
 testfe:	DEFINES+= -DMAIN
@@ -138,14 +138,13 @@
 	$(LD) $(SHAREDFLAGS) -o $@ $+ $(LIBS) $(LIBSTFONTSERVER_LIBS) $(RUNPATH)
 
 stfontserverd: $(DAEMON_OBJS)
-	$(LB) $(LDFLAGS) -o $@ $+ $(LIBS) $(LIBSTFONTSERVER_LIBS) -L$(TOP)/stsflib -lstsf
+	$(LB) $(LDFLAGS) -o $@ $+ $(LIBS) $(LIBSTFONTSERVER_LIBS) -L$(TOP)/stsflib -lstsf $(FONTCONFIG_LIBS)
 
 saverestore.o: saverestore.c saverestore.inc 
 
 saverestore.inc: saverestore.def genoffsets.py saverestore.h
-	@chmod +x genoffsets.py
 	@rm -f genoffsets.c genoffsets saverestore.inc
-	./genoffsets.py saverestore.def genoffsets.c
+	python ./genoffsets.py saverestore.def genoffsets.c
 	$(CC) $(CFLAGS) -o genoffsets -DSTSF -I$(TOP)/stsflib -I$(TOP)/interface genoffsets.c
 	./genoffsets > saverestore.inc
 

Index: stfs-door.c
===================================================================
RCS file: /cvs/stsf/stsf/STFontServer/src/stfs-door.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/stfs-door.c	25 May 2004 21:08:21 -0000	1.6
+++ b/stfs-door.c	27 May 2004 04:26:52 -0000	1.7
@@ -86,6 +86,10 @@
 #include "stfs.h"
 #include "sharedcache.h"
 
+#ifdef HAVE_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#endif
+
 const char *modname = "stfontserverd";
 static FontServer fs = NULL;
 




More information about the stsf-commit mailing list