andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Generalize the handling of configuration files that ship with extensions.

Browse Source
This commit is contained in:
Eamon Walsh 2006-09-08 15:28:48 -04:00 committed by Eamon Walsh
parent 9deb579dc9
commit d1110c5c83
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xext/Makefile.am
View File

@ -33,6 +33,10 @@ MODULE_SRCS = \
sync.c \ sync.c \
xcmisc.c xcmisc.c
# Extra configuration files ship with some extensions
SERVERCONFIGdir = $(libdir)/xserver
SERVERCONFIG_DATA =
# Optional sources included if extension enabled by configure.ac rules # Optional sources included if extension enabled by configure.ac rules
# MIT Shared Memory extension # MIT Shared Memory extension
@ -77,8 +81,7 @@ XCSECURITY_SRCS = security.c securitysrv.h
if XCSECURITY if XCSECURITY
BUILTIN_SRCS += $(XCSECURITY_SRCS) BUILTIN_SRCS += $(XCSECURITY_SRCS)
SERVERCONFIGdir = $(libdir)/xserver SERVERCONFIG_DATA += SecurityPolicy
SERVERCONFIG_DATA = SecurityPolicy
AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
endif endif
@ -157,7 +160,7 @@ libXextmodule_la_SOURCES = $(MODULE_SRCS)
endif endif
EXTRA_DIST = \ EXTRA_DIST = \
SecurityPolicy \ $(SERVERCONFIG_DATA) \
$(MITSHM_SRCS) \ $(MITSHM_SRCS) \
$(XV_SRCS) \ $(XV_SRCS) \
$(RES_SRCS) \ $(RES_SRCS) \