Commit cae394b4 authored by Mike Gabriel's avatar Mike Gabriel

Xserver/hw/nxagent/Imakefile: Introduce the NULL variable.

parent b1d3f2ca
#include <Server.tmpl> #include <Server.tmpl>
NULL =
#ifdef OS2Architecture #ifdef OS2Architecture
SRCS1 = os2Stub.c SRCS1 = os2Stub.c
OBJS1 = os2Stub.o OBJS1 = os2Stub.o
#endif #endif
SRCS = NXwindow.c \ SRCS = \
NXwindow.c \
NXevents.c \ NXevents.c \
NXproperty.c \ NXproperty.c \
NXdixfonts.c \ NXdixfonts.c \
...@@ -64,9 +67,11 @@ SRCS = NXwindow.c \ ...@@ -64,9 +67,11 @@ SRCS = NXwindow.c \
stubs.c \ stubs.c \
xpstubs.c \ xpstubs.c \
miinitext.c \ miinitext.c \
$(SRCS1) $(SRCS1) \
$(NULL)
OBJS = NXwindow.o \ OBJS = \
NXwindow.o \
NXevents.o \ NXevents.o \
NXproperty.o \ NXproperty.o \
NXdixfonts.o \ NXdixfonts.o \
...@@ -125,44 +130,84 @@ OBJS = NXwindow.o \ ...@@ -125,44 +130,84 @@ OBJS = NXwindow.o \
stubs.o \ stubs.o \
xpstubs.o \ xpstubs.o \
miinitext.o \ miinitext.o \
$(OBJS1) $(OBJS1) \
$(NULL)
VFBINCLUDES = -I../../fb -I../../mfb -I../../render VFBINCLUDES = \
-I../../fb \
-I../../mfb \
-I../../render \
$(NULL)
INCLUDES = -I. \ INCLUDES = \
-I../../../../extras/Mesa/include \ -I. \
-I$(XBUILDINCDIR) \ -I../../../../extras/Mesa/include \
-I../../mi -I../../include -I../../os \ -I$(XBUILDINCDIR) \
-I../../miext/damage -I../../miext/cw \ -I../../mi \
-I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ -I../../include \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \ -I../../os \
$(VFBINCLUDES) \ -I../../miext/damage \
`pkg-config --cflags-only-I libxml-2.0` \ -I../../miext/cw \
`pkg-config --cflags-only-I pixman-1` -I../../GL/glx \
-I../../GL/include \
-I../../../../lib/GL/include \
-I../../Xext \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
`pkg-config --cflags-only-I pixman-1` \
`pkg-config --cflags-only-I zlib` \
`pkg-config --cflags-only-I libjpeg` \
`pkg-config --cflags-only-I libpng` \
$(NULL)
#ifdef SunArchitecture #ifdef SunArchitecture
INCLUDES = -I. \ INCLUDES = \
-I../../../../extras/Mesa/include \ -I. \
-I$(XBUILDINCDIR) \ -I../../../../extras/Mesa/include \
-I/usr/sfw/include \ -I$(XBUILDINCDIR) \
-I../../mi -I../../include -I../../os \ -I/usr/sfw/include \
-I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ -I../../mi \
-I../../miext/damage -I../../miext/cw \ -I../../include \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \ -I../../os \
$(VFBINCLUDES) \ -I../../GL/glx \
`pkg-config --cflags-only-I libxml-2.0` -I../../GL/include \
`pkg-config --cflags-only-I pixman-1` -I../../../../lib/GL/include \
-I../../Xext \
-I../../miext/damage \
-I../../miext/cw \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
`pkg-config --cflags-only-I pixman-1` \
`pkg-config --cflags-only-I zlib` \
`pkg-config --cflags-only-I libjpeg` \
`pkg-config --cflags-only-I libpng` \
$(NULL)
#else #else
#ifdef cygwinArchitecture #ifdef cygwinArchitecture
INCLUDES = -I. -I$(XBUILDINCDIR) \ INCLUDES = \
-I../../mi -I../../include -I../../os \ -I. -I$(XBUILDINCDIR) \
-I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \ -I../../mi \
-I../../miext/damage -I../../miext/cw \ -I../../include \
-I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \ -I../../os \
-I../../../../extras/Mesa/include \ -I../../GL/glx \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \ -I../../GL/include \
$(VFBINCLUDES) \ -I../../../../lib/GL/include \
`pkg-config --cflags-only-I libxml-2.0` -I../../Xext \
`pkg-config --cflags-only-I pixman-1` -I../../miext/damage \
-I../../miext/cw \
-I../../../../../nxcomp \
-I../../../../../nxcompext \
-I../../../../../nxcompshad \
-I../../../../extras/Mesa/include \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
`pkg-config --cflags-only-I pixman-1` \
`pkg-config --cflags-only-I zlib` \
`pkg-config --cflags-only-I libjpeg` \
`pkg-config --cflags-only-I libpng` \
$(NULL)
#endif #endif
#endif #endif
...@@ -182,36 +227,40 @@ INCLUDES = -I. -I$(XBUILDINCDIR) \ ...@@ -182,36 +227,40 @@ INCLUDES = -I. -I$(XBUILDINCDIR) \
# NXAGENT_RANDR_XINERAMA_CLIPPING cut off invisible window parts in xinerama mode (you probably do not want this) # NXAGENT_RANDR_XINERAMA_CLIPPING cut off invisible window parts in xinerama mode (you probably do not want this)
#if nxVersion #if nxVersion
NX_DEFINES=-DNX_VERSION_CURRENT="$(NX_VERSION_CURRENT)" \ NX_DEFINES = \
-DNX_VERSION_CURRENT_STRING="\"$(NX_VERSION_CURRENT_STRING)\"" -DNX_VERSION_CURRENT="$(NX_VERSION_CURRENT)" \
-DNX_VERSION_CURRENT_STRING="\"$(NX_VERSION_CURRENT_STRING)\"" \
$(NULL)
#endif #endif
DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \ DEFINES = \
-UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI -UXFree86LOADER \ -g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \
-DNXAGENT_SERVER \ -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI -UXFree86LOADER \
-DNXAGENT_CONSTRAINCURSOR \ -DNXAGENT_SERVER \
-DNXAGENT_FONTCACHE_SIZE=50 \ -DNXAGENT_CONSTRAINCURSOR \
-DNXAGENT_GLYPHCACHE -DNXAGENT_GLYPHCACHE_SIZE=50 \ -DNXAGENT_FONTCACHE_SIZE=50 \
-DNXAGENT_SHAPE2 \ -DNXAGENT_GLYPHCACHE -DNXAGENT_GLYPHCACHE_SIZE=50 \
-DNXAGENT_FIXKEYS \ -DNXAGENT_SHAPE2 \
-DNXAGENT_CLIPBOARD \ -DNXAGENT_FIXKEYS \
-DNXAGENT_EXPOSURES \ -DNXAGENT_CLIPBOARD \
-DNXAGENT_FONTEXCLUDE \ -DNXAGENT_EXPOSURES \
-DNXAGENT_PACKEDIMAGES \ -DNXAGENT_FONTEXCLUDE \
-DNXAGENT_VISIBILITY \ -DNXAGENT_PACKEDIMAGES \
-DNXAGENT_WAKEUP=1000 \ -DNXAGENT_VISIBILITY \
-DNXAGENT_ONSTART \ -DNXAGENT_WAKEUP=1000 \
-DNXAGENT_SPLASH \ -DNXAGENT_ONSTART \
-DNXAGENT_ARTSD \ -DNXAGENT_SPLASH \
-DNXAGENT_RANDR_MODE_PREFIX \ -DNXAGENT_ARTSD \
-UNX_DEBUG_INPUT \ -DNXAGENT_RANDR_MODE_PREFIX \
-DRANDR_10_INTERFACE=1 \ -UNX_DEBUG_INPUT \
-DRANDR_12_INTERFACE=1 \ -DRANDR_10_INTERFACE=1 \
-DRANDR_13_INTERFACE=1 \ -DRANDR_12_INTERFACE=1 \
-DRANDR_14_INTERFACE=1 \ -DRANDR_13_INTERFACE=1 \
-DRANDR_15_INTERFACE=1 \ -DRANDR_14_INTERFACE=1 \
-DPANORAMIX \ -DRANDR_15_INTERFACE=1 \
-UDEBUG_TREE -DPANORAMIX \
-UDEBUG_TREE \
$(NULL)
all:: $(OBJS) all:: $(OBJS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment