summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-09-27 23:28:46 +0000
committerKevin E Martin <kem@kem.org>2005-09-27 23:28:46 +0000
commit88957862b812b3e1e19d5e11365a22dc249cf4d2 (patch)
tree86cd4ef9a0bb8def095e95ee8768be988028cc9e /hw
parent003655c02ad3a031031bb4ac859966a513f63e10 (diff)
Fix distcheck build and install errors.
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/dummylib/Makefile.am2
-rw-r--r--hw/xfree86/utils/xorgcfg/Makefile.am57
-rw-r--r--hw/xfree86/utils/xorgconfig/Makefile.am2
3 files changed, 38 insertions, 23 deletions
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index 0af326167..74f319ad1 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -47,4 +47,4 @@ libdummy_nonserver_a_SOURCES = \
xf86verbose.c \
$(srcdir)/../os-support/shared/sigiostubs.c
-EXTRA_DIST = README
+EXTRA_DIST = README dummylib.h
diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am
index 24a417ffa..1f8c8cb59 100644
--- a/hw/xfree86/utils/xorgcfg/Makefile.am
+++ b/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -49,27 +49,41 @@ CURSESDEFINES = -DHAS_NCURSES
endif
xorgcfg_SOURCES = \
- accessx.c\
- card-cfg.c\
- cards.c\
- config.c\
- expert.c\
- help.c\
- interface.c\
- keyboard-cfg.c\
- $(LDSRCS) \
- monitor-cfg.c\
- mouse-cfg.c\
- options.c\
- screen-cfg.c\
- screen.c\
- $(SNPRINTFSRCS)\
- startx.c\
- $(STRLSRCS)\
- stubs.c\
- $(TEXTSRC)\
- vidmode.c\
- xf86config.c
+ accessx.c \
+ card-cfg.c \
+ cards.c \
+ config.c \
+ expert.c \
+ help.c \
+ interface.c \
+ keyboard-cfg.c \
+ $(LDSRCS) \
+ monitor-cfg.c \
+ mouse-cfg.c \
+ options.c \
+ screen-cfg.c \
+ screen.c \
+ $(SNPRINTFSRCS) \
+ startx.c \
+ $(STRLSRCS) \
+ stubs.c \
+ $(TEXTSRC) \
+ vidmode.c \
+ xf86config.c \
+ card-cfg.h \
+ cards.h \
+ config.h \
+ help.h \
+ keyboard-cfg.h \
+ loader.h \
+ monitor-cfg.h \
+ mouse-cfg.h \
+ options.h \
+ screen-cfg.h \
+ screen.h \
+ stubs.h \
+ vidmode.h \
+ xf86config.h
XBMdir = $(includedir)/X11/bitmaps
XPMdir = $(includedir)/X11/pixmaps
@@ -125,4 +139,5 @@ CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
dist_man1_MANS = \
xorgcfg.man
+EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre
endif
diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am
index 25e74d739..17a3f7879 100644
--- a/hw/xfree86/utils/xorgconfig/Makefile.am
+++ b/hw/xfree86/utils/xorgconfig/Makefile.am
@@ -29,7 +29,7 @@
bin_PROGRAMS = xorgconfig
X11dir = $(libdir)/X11
-X11_DATA = Cards
+dist_X11_DATA = Cards
xorgconfig_CFLAGS = $(DEP_CFLAGS) \
-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \