- lib/lbxutil/lbxutil.pc.in: link to lbxutil, not XfixesXORG-6_8_99_15

- symlink.sh: add xedit.h, add xedit/lis/mp directory, add xfs
- xc/programs/xedit: include "lisp/../xedit.h" instead of xedit/xedit.h
- Change include of "foo.h" to <X11/.../foo.h> in various places in
    xc/programs/lbxproxy and xc/programs/xfs
- add build system for xfs
- add forgotten lbxproxytrans.c file

9 files changed, 11 insertions, 11 deletions

diff --git a/include/clientstr.h b/include/clientstr.h
index 4f977ce..ceaba91 100644
--- a/include/clientstr.h
+++ b/include/clientstr.h
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _CLIENTSTR_H_
 #define	_CLIENTSTR_H_
 
-#include	"FS.h"
+#include	<X11/fonts/FS.h>
 #include	"client.h"
 #include	"auth.h"
 #include	"misc.h"
diff --git a/include/closestr.h b/include/closestr.h
index 9d38ff2..1e3e412 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -51,10 +51,10 @@ in this Software without prior written authorization from The Open Group.
 #ifndef CLOSESTR_H
 #define CLOSESTR_H
 
-#include	"FSproto.h"
+#include	<X11/fonts/FSproto.h>
 #include	"closure.h"
 #include	"misc.h"
-#include	"font.h"
+#include	<X11/fonts/font.h>
 
 /* closure structures */
 
diff --git a/include/difs.h b/include/difs.h
index c2de977..2299f25 100644
--- a/include/difs.h
+++ b/include/difs.h
@@ -29,7 +29,7 @@
 
 #include "difsfn.h"
 #include "globals.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 
 typedef int (*InitialFunc)(ClientPtr);
 typedef int (*ProcFunc)(ClientPtr);
diff --git a/include/difsfn.h b/include/difsfn.h
index a55a9f8..0922810 100644
--- a/include/difsfn.h
+++ b/include/difsfn.h
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _DIFSFONT_H_
 #define _DIFSFONT_H_
 #include	"misc.h"
-#include	"font.h"
+#include	<X11/fonts/font.h>
 
 typedef struct _ClientFont *ClientFontPtr;
 typedef struct _FontIDList *FontIDListPtr;
diff --git a/include/difsfnst.h b/include/difsfnst.h
index 4353155..3d7080e 100644
--- a/include/difsfnst.h
+++ b/include/difsfnst.h
@@ -50,7 +50,7 @@ in this Software without prior written authorization from The Open Group.
 #define _DIFSFONTST_H_
 
 #include	"difsfn.h"
-#include	"font.h"
+#include	<X11/fonts/font.h>
 #include	"misc.h"
 
 /* has per-client info about the font */
diff --git a/include/difsutils.h b/include/difsutils.h
index d8a1ef4..d25a270 100644
--- a/include/difsutils.h
+++ b/include/difsutils.h
@@ -32,9 +32,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <misc.h>
 #include <auth.h>
-#include <font.h>
+#include <X11/fonts/font.h>
 #include <accstr.h>
-#include <fontstruct.h>
+#include <X11/fonts/fontstruct.h>
 
 typedef void (*DifsWakeupFunc)(pointer data, int result, unsigned long * pReadmask);
 typedef Bool (*DifsWorkFunc) (ClientPtr, pointer);
diff --git a/include/fsevents.h b/include/fsevents.h
index 7ed50fb..9ff03a5 100644
--- a/include/fsevents.h
+++ b/include/fsevents.h
@@ -54,7 +54,7 @@ in this Software without prior written authorization from the X Consortium.
 #define _EVENTS_H_
 
 #include	<misc.h>
-#include	"FS.h"
+#include	<X11/fonts/FS.h>
 
 extern int ProcGetEventMask(ClientPtr client);
 extern int ProcSetEventMask(ClientPtr client);
diff --git a/include/globals.h b/include/globals.h
index 9b4d083..650bb55 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
 
-#include	"FSproto.h"	/* for fsResolution */
+#include	<X11/fonts/FSproto.h>	/* for fsResolution */
 
 extern long TimeOutValue;
 extern long ReapClientTime;
diff --git a/include/os.h b/include/os.h
index bfc1074..2448552 100644
--- a/include/os.h
+++ b/include/os.h
@@ -56,7 +56,7 @@ typedef struct _FontPathRec *FontPathPtr;
 typedef struct _alt_server *AlternateServerPtr;
 typedef struct _auth *AuthPtr;
 
-#include "FSproto.h"
+#include <X11/fonts/FSproto.h>
 #include "client.h"
 #include "misc.h"