aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/Makefile.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-14 21:52:51 +0000
committermarha <marha@users.sourceforge.net>2010-02-14 21:52:51 +0000
commit00e6751183c1e854ea3eba746b101449b32201a4 (patch)
tree3494085d6728e086582f30c8a68846d81840303d /xorg-server/hw/xwin/Makefile.in
parentac637a8cd15f3977f44b701c7ac71a561763c1d8 (diff)
parent8d38172d866775594af3185ae3fbd8d750677650 (diff)
downloadvcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.gz
vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.tar.bz2
vcxsrv-00e6751183c1e854ea3eba746b101449b32201a4.zip
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xwin/Makefile.in')
-rw-r--r--xorg-server/hw/xwin/Makefile.in59
1 files changed, 44 insertions, 15 deletions
diff --git a/xorg-server/hw/xwin/Makefile.in b/xorg-server/hw/xwin/Makefile.in
index af96f7508..1d7fb3b20 100644
--- a/xorg-server/hw/xwin/Makefile.in
+++ b/xorg-server/hw/xwin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -64,7 +64,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
- "$(DESTDIR)$(filemandir)"
+ "$(DESTDIR)$(filemandir)" "$(DESTDIR)$(xwinconfigdir)"
PROGRAMS = $(bin_PROGRAMS)
am__XWin_SOURCES_DIST = InitInput.c InitOutput.c winallpriv.c \
winauth.c winblock.c wincmap.c winconfig.c wincreatewnd.c \
@@ -202,7 +202,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(appman_DATA) $(fileman_DATA)
+DATA = $(appman_DATA) $(fileman_DATA) $(xwinconfig_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -388,8 +388,11 @@ SHELL = @SHELL@
SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
TSLIB_CFLAGS = @TSLIB_CFLAGS@
TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
@@ -449,6 +452,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
@@ -654,6 +658,8 @@ appman_DATA = XWin.$(APP_MAN_SUFFIX)
filemandir = $(FILE_MAN_DIR)
fileman_DATA = XWinrc.$(FILE_MAN_SUFFIX)
EXTRAMANDEFS = -D__logdir__=$(logdir) -D__sysconfdir__=$(sysconfdir) -D__datadir__=$(datadir)
+xwinconfigdir = $(sysconfdir)/X11
+xwinconfig_DATA = system.XWinrc
SUFFIXES = .pre .man .man.pre
# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
@@ -685,7 +691,9 @@ MANDEFS = \
-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
-D__mandir__=$(mandir) \
-D__projectroot__=$(prefix) \
- -D__xconfigfile__=$(__XCONFIGFILE__) -D__xconfigdir__=$(XCONFIGDIR) \
+ -D__datadir__=$(datadir) \
+ -D__xconfigfile__=$(__XCONFIGFILE__) \
+ -D__xconfigdir__=$(__XCONFIGDIR__) \
-D__xkbdir__=$(XKB_BASE_DIRECTORY) \
-D__modulepath__="$(DEFAULT_MODULE_PATH)" \
-D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME)
@@ -693,7 +701,6 @@ MANDEFS = \
EXTRA_DIST = \
$(GLX_EXTRAS) \
$(MAN_SRCS) \
- _usr_X11R6_lib_X11_system.XWinrc \
X.ico \
XWin.rc \
xlaunch/config.cc \
@@ -1012,6 +1019,26 @@ uninstall-filemanDATA:
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(filemandir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(filemandir)" && rm -f $$files
+install-xwinconfigDATA: $(xwinconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(xwinconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(xwinconfigdir)"
+ @list='$(xwinconfig_DATA)'; test -n "$(xwinconfigdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xwinconfigdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(xwinconfigdir)" || exit $$?; \
+ done
+
+uninstall-xwinconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(xwinconfig_DATA)'; test -n "$(xwinconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(xwinconfigdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(xwinconfigdir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1100,7 +1127,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(filemandir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(filemandir)" "$(DESTDIR)$(xwinconfigdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -1156,7 +1183,8 @@ info: info-am
info-am:
-install-data-am: install-appmanDATA install-filemanDATA
+install-data-am: install-appmanDATA install-filemanDATA \
+ install-xwinconfigDATA
install-dvi: install-dvi-am
@@ -1203,7 +1231,7 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-filemanDATA
+ uninstall-filemanDATA uninstall-xwinconfigDATA
.MAKE: all check install install-am install-strip
@@ -1216,16 +1244,17 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
install-exec-am install-filemanDATA install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-appmanDATA uninstall-binPROGRAMS \
- uninstall-filemanDATA
+ install-strip install-xwinconfigDATA installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-appmanDATA \
+ uninstall-binPROGRAMS uninstall-filemanDATA \
+ uninstall-xwinconfigDATA
.rc.o:
- $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\"
+ $(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
winprefsyacc.h: winprefsyacc.c
winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h