aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/Imakefile2
-rw-r--r--nx-X11/programs/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/GL/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc10
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile2
-rw-r--r--nx-X11/programs/Xserver/Xi/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/dbe/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/mi/Imakefile6
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile4
9 files changed, 18 insertions, 18 deletions
diff --git a/nx-X11/Imakefile b/nx-X11/Imakefile
index b2874c3a8..9bd07b215 100644
--- a/nx-X11/Imakefile
+++ b/nx-X11/Imakefile
@@ -144,7 +144,7 @@ install::
#endif /* not Win32Architecture else */
-XCOMM special target to determine if the xmakefile exists.
+XCOMM special target to determine if the xmakefile exists.
XCOMM Works on both Unix and NMAKE.EXE
xmakefile-exists::
diff --git a/nx-X11/programs/Imakefile b/nx-X11/programs/Imakefile
index 743851143..f290e5373 100644
--- a/nx-X11/programs/Imakefile
+++ b/nx-X11/programs/Imakefile
@@ -25,7 +25,7 @@
XSSRCDIR = Xserver
#endif
-SUBDIRS = $(XSSRCDIR)
+SUBDIRS = $(XSSRCDIR)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile
index 19b5902a5..47dbf795c 100644
--- a/nx-X11/programs/Xserver/GL/Imakefile
+++ b/nx-X11/programs/Xserver/GL/Imakefile
@@ -27,7 +27,7 @@ DEFINES = $(GLX_DEFINES)
MakeMutex($(SUBDIRS) $(OBJS) $(DONES))
#endif
-#if HasGnuMake || HasBsdMake
+#if HasGnuMake || HasBsdMake
$(DONES): $(SUBDIRS)
#endif
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
index 567ad65b8..5d55a5855 100644
--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
@@ -1,7 +1,7 @@
MESASWRSETUPDIR = MesaSwrastSetupBuildDir
MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \
- $(MESASWRSETUPDIR)ss_triangle.c
+ $(MESASWRSETUPDIR)ss_triangle.c
#ifdef NeedToLinkMesaSrc
LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/mesa/swrast_setup)
@@ -13,18 +13,18 @@ LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/mesa/swrast_setup)
#endif
MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \
- $(MESASWRSETUPDIR)ss_triangle.o
+ $(MESASWRSETUPDIR)ss_triangle.o
#if defined(DoSharedLib) && DoSharedLib
MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \
- $(MESASWRSETUPDIR)unshared/ss_triangle.o
+ $(MESASWRSETUPDIR)unshared/ss_triangle.o
#else
MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS)
#endif
MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \
- $(MESASWRSETUPDIR)debugger/ss_triangle.o
+ $(MESASWRSETUPDIR)debugger/ss_triangle.o
MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \
- $(MESASWRSETUPDIR)profiled/ss_triangle.o
+ $(MESASWRSETUPDIR)profiled/ss_triangle.o
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index c3bb8391f..ad9a2d058 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -87,7 +87,7 @@ XF86BIGFOBJS = xf86bigfont.o
$(XF86BIGFOBJS)
#if defined(NXAgentServer) && NXAgentServer
-NX_DEFINES = -DNXAGENT_SERVER
+NX_DEFINES = -DNXAGENT_SERVER
#endif
diff --git a/nx-X11/programs/Xserver/Xi/Imakefile b/nx-X11/programs/Xserver/Xi/Imakefile
index 746e57eaa..c0eede6a1 100644
--- a/nx-X11/programs/Xserver/Xi/Imakefile
+++ b/nx-X11/programs/Xserver/Xi/Imakefile
@@ -37,7 +37,7 @@
stubs.c \
ungrdev.c \
ungrdevb.c \
- ungrdevk.c
+ ungrdevk.c
OBJS = allowev.o \
chgkbd.o \
@@ -75,7 +75,7 @@
setmmap.o \
ungrdev.o \
ungrdevb.o \
- ungrdevk.o
+ ungrdevk.o
INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) `pkg-config --cflags-only-I pixman-1`
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
diff --git a/nx-X11/programs/Xserver/dbe/Imakefile b/nx-X11/programs/Xserver/dbe/Imakefile
index 3c4f40174..6bef0aff1 100644
--- a/nx-X11/programs/Xserver/dbe/Imakefile
+++ b/nx-X11/programs/Xserver/dbe/Imakefile
@@ -1,8 +1,8 @@
#include <Server.tmpl>
- SRCS = dbe.c midbe.c
- OBJS = dbe.o midbe.o
+ SRCS = dbe.c midbe.c
+ OBJS = dbe.o midbe.o
INCLUDES = -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES) `pkg-config --cflags-only-I pixman-1`
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 71245a407..40e746c8d 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -116,9 +116,9 @@ OBJS = $(CBRT_OBJ) \
$(NULL)
#if defined(XorgVersion)
-/*
- * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o
- * used by Xnest, Xvfb
+/*
+ * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o
+ * used by Xnest, Xvfb
*/
#if NXLibraries
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 1b1c2d4fe..031a1eaa2 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -70,7 +70,7 @@ XDMAUTHDEFS = -DHASXDMAUTH
XDMAUTHOBJS = xdmauth.o
XDMAUTHSRCS = xdmauth.c
#else
-XDMAUTHDEFS =
+XDMAUTHDEFS =
XDMAUTHOBJS =
XDMAUTHSCRS =
#endif
@@ -133,7 +133,7 @@ TMEMCMP_SRCS = timingsafe_memcmp.c
TMEMCMP_OBJS = timingsafe_memcmp.o
#endif
-BOOTSTRAPCFLAGS =
+BOOTSTRAPCFLAGS =
SRCS = WaitFor.c \
access.c \
client.c \