frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure xorgcfg files are included even when dist made with --disable-xorgcfg

This commit is contained in:
Alan Coopersmith 2006-10-13 19:05:28 -07:00 committed by Daniel Stone
parent 1b1698af41
commit 5563861ab7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xfree86/utils/xorgcfg/Makefile.am
View File

@ -56,6 +56,7 @@ endif
if NEED_STRLCAT if NEED_STRLCAT
STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
endif endif
endif BUILD_XORGCFG
xorgcfg_SOURCES = \ xorgcfg_SOURCES = \
accessx.c \ accessx.c \
@ -95,10 +96,7 @@ xorgcfg_SOURCES = \
xf86config.h \ xf86config.h \
$(STRL_SRCS) $(STRL_SRCS)
XBMdir = $(includedir)/X11/bitmaps BITMAPS = \
XPMdir = $(includedir)/X11/pixmaps
XBM_DATA = \
card.xbm \ card.xbm \
keyboard.xbm \ keyboard.xbm \
monitor.xbm \ monitor.xbm \
@ -112,7 +110,7 @@ XBM_DATA = \
shorter.xbm \ shorter.xbm \
taller.xbm taller.xbm
XPM_DATA = \ PIXMAPS = \
card.xpm \ card.xpm \
computer.xpm \ computer.xpm \
keyboard.xpm \ keyboard.xpm \
@ -122,6 +120,13 @@ XPM_DATA = \
# Rules needed to cpp man page & app-defaults # Rules needed to cpp man page & app-defaults
include $(top_srcdir)/cpprules.in include $(top_srcdir)/cpprules.in
if BUILD_XORGCFG
XBMdir = $(includedir)/X11/bitmaps
XPMdir = $(includedir)/X11/pixmaps
XBM_DATA = $(BITMAPS)
XPM_DATA = $(PIXMAPS)
# App default files (*.ad) # App default files (*.ad)
appdefaultdir = @APPDEFAULTDIR@ appdefaultdir = @APPDEFAULTDIR@
@ -146,7 +151,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
all-local: $(appman_PRE) $(appman_DATA) all-local: $(appman_PRE) $(appman_DATA)
EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre xorgcfg.man.pre
BUILT_SOURCES = $(appman_PRE) BUILT_SOURCES = $(appman_PRE)
CLEANFILES = $(APPDEFAULTFILES) $(BUILT_SOURCES) $(appman_DATA) CLEANFILES = $(APPDEFAULTFILES) $(BUILT_SOURCES) $(appman_DATA)
@ -156,4 +160,6 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man
-rm -f $@ -rm -f $@
$(LN_S) $< $@ $(LN_S) $< $@
endif endif BUILD_XORGCFG
EXTRA_DIST = $(BITMAPS) $(PIXMAPS) XOrgCfg.pre xorgcfg.man.pre