aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-08 09:27:29 +0000
committermarha <marha@users.sourceforge.net>2009-10-08 09:27:29 +0000
commit3e96b1b8a0faf7a10110759a06ff77eb6284b987 (patch)
tree29ecbb7a48c7370aac64e43e83e82306c33c228d
parent2b681aaa857f3a7fcc2db66053530339b09f9432 (diff)
downloadvcxsrv-3e96b1b8a0faf7a10110759a06ff77eb6284b987.tar.gz
vcxsrv-3e96b1b8a0faf7a10110759a06ff77eb6284b987.tar.bz2
vcxsrv-3e96b1b8a0faf7a10110759a06ff77eb6284b987.zip
Syncronised makefile and makefile.am a little bit more.
-rw-r--r--xorg-server/hw/xwin/makefile46
1 files changed, 23 insertions, 23 deletions
diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile
index 74dcfaeed..2c82d9499 100644
--- a/xorg-server/hw/xwin/makefile
+++ b/xorg-server/hw/xwin/makefile
@@ -26,6 +26,20 @@ DEFINES += XWIN_MULTIWINDOW
# winwindowswm.c
#DEFINES += XWIN_MULTIWINDOWEXTWM
+SRCS_NATIVEGDI = \
+ winclip.c \
+ winfillsp.c \
+ winfont.c \
+ wingc.c \
+ wingetsp.c \
+ winnativegdi.c \
+ winpixmap.c \
+ winpolyline.c \
+ winrop.c \
+ winsetsp.c
+DEFINES += XWIN_NATIVEGDI
+
+
SRCS_RANDR = \
winrandr.c
DEFINES += XWIN_RANDR RELOCATE_PROJECTROOT
@@ -61,9 +75,15 @@ CSRCS = InitInput.c \
winvalargs.c \
winwakeup.c \
winwindow.c \
- winprefslex.c \
- winprefsyacc.c \
- winwndproc.c $(SRCS_RANDR) $(SRCS_MULTIWINDOW) $(SRCS_MULTIWINDOWEXTWM) $(SRCS_CLIPBOARD)
+ winprefslex.c \
+ winprefsyacc.c \
+ winwndproc.c \
+ $(SRCS_RANDR) \
+ $(SRCS_CLIPBOARD) \
+ $(SRCS_MULTIWINDOW) \
+ $(SRCS_MULTIWINDOWEXTWM) \
+ $(SRCS_NATIVEGDI)
+
DEFINES += YY_NO_UNISTD_H
@@ -72,31 +92,11 @@ DEFINES += YY_NO_UNISTD_H
# $(top_srcdir)/Xi/stubs.c \
# $(top_srcdir)/mi/miinitext.c \
# $(top_srcdir)/fb/fbcmap_mi.c \
-# $(SRCS_CLIPBOARD) \
-# $(SRCS_GLX_WINDOWS) \
-# $(SRCS_MULTIWINDOW) \
-# $(SRCS_MULTIWINDOWEXTWM) \
-# $(SRCS_NATIVEGDI) \
# $(SRCS_PRIMARYFB) \
-# $(SRCS_RANDR) \
# $(SRCS_XV)
INCLUDES += ..\..\miext\rootless
-SRCS_NATIVEGDI = \
- winclip.c \
- winfillsp.c \
- winfont.c \
- wingc.c \
- wingetsp.c \
- winnativegdi.c \
- winpixmap.c \
- winpolyline.c \
- winrop.c \
- winsetsp.c
-CSRCS += $(SRCS_NATIVEGDI)
-DEFINES += XWIN_NATIVEGDI
-
#.rc.o:
# $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\" -DPROJECT_VERSION=\"$(PACKAGE_VERSION)\" -DBUILD_DATE=\"$(BUILD_DATE)\"