diff options
37 files changed, 81 insertions, 60 deletions
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index 0aa890bbb..49535fe18 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -118,12 +118,12 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; #endif /* XTHREADS else */ -#include "NX.h" +#include <nx/NX.h> #ifdef NX_TRANS_SOCKET -#include "NX.h" -#include "NXvars.h" +#include <nx/NX.h> +#include <nx/NXvars.h> static struct timeval retry; diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index 854b64b22..474b77349 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -64,7 +64,7 @@ from The Open Group. #ifdef NX_TRANS_SOCKET -#include "NXvars.h" +#include <nx/NXvars.h> #define _XGetIOError(dpy) \ (dpy -> flags & XlibDisplayIOError) diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index b08cd9f0a..5c57fc5ba 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -344,7 +344,7 @@ static int haveIPv6 = 1; #ifdef TRANS_CLIENT -#include "NX.h" +#include <nx/NX.h> typedef struct { diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 379a70004..d1f2ff335 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -318,6 +318,27 @@ NXAGENTDDXDIR = hw NXAGENTDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS) +NX_XCOMP_HEADERS = \ + ../../../nxcomp/NXalert.h \ + ../../../nxcomp/NX.h \ + ../../../nxcomp/NXpack.h \ + ../../../nxcomp/NXproto.h \ + ../../../nxcomp/NXvars.h + +NX_XCOMPEXT_HEADERS = \ + ../../../nxcompext/NXlib.h \ + ../../../nxcompext/NXlibint.h + +NX_XCOMPSHAD_HEADERS = \ + ../../../nxcompshad/Shadow.h + +NX_HEADERS = \ + $(NX_XCOMP_HEADERS) \ + $(NX_XCOMPEXT_HEADERS) \ + $(NX_XCOMPSHAD_HEADERS) + +BuildIncludes($(NX_HEADERS),nx,..) + #if defined(SunArchitecture) || \ defined(SparcArchitecture) NXAGENTOBJS = hw/nxagent/miinitext.o \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 3442c3789..59d3deb63 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -67,8 +67,8 @@ is" without express or implied warranty. * NX includes and definitions. */ -#include "NXlib.h" -#include "NXpack.h" +#include <nx/NXlib.h> +#include <nx/NXpack.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index 578731f07..00411c65e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -26,7 +26,7 @@ #include "scrnintstr.h" #include "resource.h" -#include "NXpack.h" +#include <nx/NXpack.h> #include "Atoms.h" #include "Args.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Binder.c b/nx-X11/programs/Xserver/hw/nxagent/Binder.c index d40aaebe6..f69d23f4f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Binder.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Binder.c @@ -20,7 +20,7 @@ #include <string.h> #include <ctype.h> -#include "NX.h" +#include <nx/NX.h> #include "Binder.h" #include "Options.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index cba47981d..eaa216e20 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -23,7 +23,7 @@ #include <time.h> #include <errno.h> -#include "NX.h" +#include <nx/NX.h> #include "Xatom.h" #include "dixstruct.h" @@ -49,7 +49,7 @@ * definition of GC in Agent.h. */ -#include "NXlib.h" +#include <nx/NXlib.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 82a1ed77e..f3656d2c0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -39,7 +39,7 @@ * Use asyncronous get property replies. */ -#include "NXlib.h" +#include <nx/NXlib.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index c0015a831..62095d5b3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -57,7 +57,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "resource.h" -#include "NXlib.h" +#include <nx/NXlib.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index 63c3b73c1..354f04120 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -33,9 +33,9 @@ #include "Display.h" #include "Dialog.h" -#include "NX.h" -#include "NXlib.h" -#include "NXalert.h" +#include <nx/NX.h> +#include <nx/NXlib.h> +#include <nx/NXalert.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 628c4c495..31ea7c2a0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -52,7 +52,7 @@ is" without express or implied warranty. #include "unistd.h" #endif -#include "NXalert.h" +#include <nx/NXalert.h> #include "Agent.h" #include "Display.h" @@ -77,8 +77,8 @@ is" without express or implied warranty. #include "Screen.h" #include "Handlers.h" -#include "NX.h" -#include "NXlib.h" +#include <nx/NX.h> +#include <nx/NXlib.h> #include NXAGENT_ICON_NAME #include X2GOAGENT_ICON_NAME diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 51d41db23..9dac8066a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -34,7 +34,7 @@ #include "Reconnect.h" #include "GCOps.h" -#include "NXlib.h" +#include <nx/NXlib.h> #include "mibstorest.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 5ad81f781..ffb593750 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -58,9 +58,9 @@ #include "Utils.h" #include "Error.h" -#include "NX.h" -#include "NXvars.h" -#include "NXproto.h" +#include <nx/NX.h> +#include <nx/NXvars.h> +#include <nx/NXproto.h> #include "xfixesproto.h" #define Window XlibWindow @@ -92,10 +92,10 @@ #include <nx-X11/cursorfont.h> -#include "Shadow.h" +#include <nx/Shadow.h> #include "X11/include/Xrandr_nxagent.h" -#include "NXlib.h" +#include <nx/NXlib.h> /* * Set here the required log level. Please note diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 9123f4bbe..8f692eb85 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -50,8 +50,8 @@ is" without express or implied warranty. #include "Args.h" -#include "NXlib.h" -#include "NXalert.h" +#include <nx/NXlib.h> +#include <nx/NXalert.h> #include <string.h> #include <stdlib.h> diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index 5f753ffe4..634bbf2ce 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -50,7 +50,7 @@ is" without express or implied warranty. #include "Args.h" #include "Screen.h" -#include "NXlib.h" +#include <nx/NXlib.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index aee983253..cadb8e58a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -32,8 +32,8 @@ #include "Screen.h" #include "Millis.h" -#include "NXlib.h" -#include "Shadow.h" +#include <nx/NXlib.h> +#include <nx/Shadow.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index c84d3b7ed..6a7d46c35 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -37,8 +37,8 @@ #include "Pixels.h" #include "Utils.h" -#include "NXlib.h" -#include "NXpack.h" +#include <nx/NXlib.h> +#include <nx/NXpack.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index b0aff4b07..e9cef5ae3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -133,7 +133,7 @@ OBJS = NXwindow.o \ VFBINCLUDES = -I../../fb -I../../mfb -I../../render -INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ +INCLUDES = -I. \ -I../../../../extras/Mesa/include \ -I$(XBUILDINCDIR) \ -I../../mi -I../../include -I../../os \ @@ -144,7 +144,7 @@ INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../ `pkg-config --cflags-only-I libxml-2.0` \ `pkg-config --cflags-only-I pixman-1` #ifdef SunArchitecture -INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ +INCLUDES = -I. \ -I../../../../extras/Mesa/include \ -I$(XBUILDINCDIR) \ -I/usr/sfw/include \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 0b25aa57d..3ec9fa14a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -61,8 +61,8 @@ is" without express or implied warranty. #include "Millis.h" #include "Error.h" -#include "NX.h" -#include "NXlib.h" +#include <nx/NX.h> +#include <nx/NXlib.h> #include "Reconnect.h" /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 8d1fbd4c1..852771492 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -54,9 +54,9 @@ is" without express or implied warranty. #include "Options.h" #include "Error.h" -#include "NXlib.h" +#include <nx/NXlib.h> -#include "Shadow.h" +#include <nx/Shadow.h> #ifdef XKB diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 6a1f2ac6a..adeaff870 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -154,7 +154,7 @@ int ProcInitialConnection(); #include "Reconnect.h" #include "Millis.h" #include "Font.h" -#include "Shadow.h" +#include <nx/Shadow.h> #include "Handlers.h" #include "Keyboard.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index f871cad13..89c5c0b19 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -183,7 +183,7 @@ xEvent *xeviexE; #include "dixgrabs.h" #include "../../dix/dispatch.h" -#include "NXlib.h" +#include <nx/NXlib.h> #include "Events.h" #include "Windows.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 67c514714..c9f62b1fe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -42,8 +42,8 @@ #include "Holder.h" #include "Args.h" -#include "NXlib.h" -#include "NXpack.h" +#include <nx/NXlib.h> +#include <nx/NXpack.h> RESTYPE RT_NX_PIXMAP; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c index a751974af..ce2b37a90 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c @@ -46,7 +46,7 @@ is" without express or implied warranty. #include "Events.h" #include "Options.h" -#include "NXlib.h" +#include <nx/NXlib.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 660d30863..00d434bf4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -49,9 +49,9 @@ #include "XKBsrv.h" #endif -#include "NX.h" -#include "NXlib.h" -#include "NXalert.h" +#include <nx/NX.h> +#include <nx/NXlib.h> +#include <nx/NXalert.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index de1ad1207..d5f64d05b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -54,7 +54,7 @@ #include "Pixels.h" #include "Handlers.h" -#include "NXproto.h" +#include <nx/NXproto.h> #define MAX_FORMATS 255 diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 4cf4afcad..a725e20e7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -30,7 +30,7 @@ #include "Atoms.h" #include "Trap.h" -#include "NXlib.h" +#include <nx/NXlib.h> /* * Set here the required log level. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 83bcc01fd..20ec3672a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -74,7 +74,7 @@ is" without express or implied warranty. #include "Pointer.h" #include "Reconnect.h" #include "Composite.h" -#include "Shadow.h" +#include <nx/Shadow.h> #include "Utils.h" #include "X11/include/Xrandr_nxagent.h" @@ -96,7 +96,7 @@ is" without express or implied warranty. #include "Xatom.h" #include "Xproto.h" -#include "NXlib.h" +#include <nx/NXlib.h> #include "mibstorest.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h index 39becaa3d..7a987d17e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h @@ -20,7 +20,7 @@ #include "Windows.h" #include "X11/Xdmcp.h" -#include "NXalert.h" +#include <nx/NXalert.h> #define XDM_TIMEOUT 20000 diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index 1840328e4..3b7961c9c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -26,7 +26,7 @@ #include "Events.h" #include "GCs.h" -#include "NXlib.h" +#include <nx/NXlib.h> /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index fb26b8242..b553627dd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -56,8 +56,8 @@ #include "Composite.h" #include "Events.h" -#include "NX.h" -#include "NXlib.h" +#include <nx/NX.h> +#include <nx/NXlib.h> #include "Xatom.h" diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c index 2444cd333..84381dbf2 100644 --- a/nx-X11/programs/Xserver/os/log.c +++ b/nx-X11/programs/Xserver/os/log.c @@ -117,7 +117,7 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifdef NX_TRANS_SOCKET -#include "NX.h" +#include <nx/NX.h> #endif diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 3f58b6fc5..13889ed9a 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -229,8 +229,8 @@ Bool noXvExtension = FALSE; #ifdef NX_TRANS_SOCKET -#include "NX.h" -#include "NXvars.h" +#include <nx/NX.h> +#include <nx/NXvars.h> #endif diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in index f4d3a7efb..f0963aa17 100644 --- a/nxcomp/nxcomp.pc.in +++ b/nxcomp/nxcomp.pc.in @@ -10,6 +10,6 @@ Version: @VERSION@ #Requires: libjpeg zlib Requires: libpng Requires.private: x11 -Cflags: -I${includedir} -I${includedir}/nx +Cflags: -I${includedir} Libs: -L${libdir} -lXcomp diff --git a/nxcompext/nxcompext.pc.in b/nxcompext/nxcompext.pc.in index 669397af6..6bd0773b1 100644 --- a/nxcompext/nxcompext.pc.in +++ b/nxcompext/nxcompext.pc.in @@ -8,6 +8,6 @@ Description: Extension for NX Compression Library Version: @VERSION@ Requires: nxcomp Requires.private: x11 -Cflags: -I${includedir} -I${includedir}/nx +Cflags: -I${includedir} Libs: -L${libdir} -lXcompext diff --git a/nxcompshad/nxcompshad.pc.in b/nxcompshad/nxcompshad.pc.in index 4d4265c76..80b75e3f5 100644 --- a/nxcompshad/nxcompshad.pc.in +++ b/nxcompshad/nxcompshad.pc.in @@ -8,6 +8,6 @@ Description: Shadow Session Support for NX Compression Library Version: @VERSION@ Requires: nxcomp Requires.private: x11 -Cflags: -I${includedir} -I${includedir}/nx +Cflags: -I${includedir} Libs: -L${libdir} -lXcompshad |