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

Fix distcheck build and install errors.

This commit is contained in:
Kevin E Martin 2005-09-27 23:28:46 +00:00
parent 003655c02a
commit 88957862b8
19 changed files with 76 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
2005-09-27 Kevin E. Martin <kem-at-freedesktop-dot-org>
* XpConfig/C/print/Makefile.am:
* XpConfig/C/print/attributes/Makefile.am:
* XpConfig/C/print/ddx-config/raster/Makefile.am:
* XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am:
* XpConfig/C/print/models/CANONC3200-PS/Makefile.am:
* XpConfig/C/print/models/GSdefault/Makefile.am:
* XpConfig/C/print/models/HPLJ4050-PS/Makefile.am:
* XpConfig/C/print/models/HPLJ4family/Makefile.am:
* XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am:
* XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am:
* XpConfig/C/print/models/PSdefault/Makefile.am:
* XpConfig/C/print/models/PSdefault/fonts/Makefile.am:
* XpConfig/C/print/models/PSspooldir/Makefile.am:
* XpConfig/C/print/models/SPSPARC2/Makefile.am:
* XpConfig/en_US/print/attributes/Makefile.am:
* hw/xfree86/dummylib/Makefile.am:
* hw/xfree86/utils/xorgcfg/Makefile.am:
* hw/xfree86/utils/xorgconfig/Makefile.am:
Fix distcheck build and install errors.
2005-09-27 Kevin E. Martin <kem-at-freedesktop-dot-org> 2005-09-27 Kevin E. Martin <kem-at-freedesktop-dot-org>
* hw/dmx/doc/Makefile.am: * hw/dmx/doc/Makefile.am:

4
XpConfig/C/print/Makefile.am
View File

@ -3,8 +3,8 @@ SUBDIRS = attributes ddx-config models
xpcdir = @xpconfigdir@/C/print xpcdir = @xpconfigdir@/C/print
Xprinters.ghostscript: Xprinters Xprinters.ghostscript: $(srcdir)/Xprinters
sed <Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" >Xprinters.ghostscript sed < $(srcdir)/Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" > Xprinters.ghostscript

5
XpConfig/C/print/attributes/Makefile.am
View File

@ -1,6 +1,3 @@
xpcdir = @xpconfigdir@/C/print/attributes xpcdir = @xpconfigdir@/C/print/attributes
xpc_DATA = document job printer dist_xpc_DATA = document job printer

4
XpConfig/C/print/ddx-config/raster/Makefile.am
View File

@ -1,5 +1,3 @@
xpcdir = @xpconfigdir@/C/print/ddx-config/raster xpcdir = @xpconfigdir@/C/print/ddx-config/raster
xpc_DATA = pcl postscript dist_xpc_DATA = pcl postscript

3
XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am
View File

@ -1,4 +1,3 @@
xpcdir = @xpconfigdir@/C/print/models/CANONBJ10E-GS xpcdir = @xpconfigdir@/C/print/models/CANONBJ10E-GS
xpc_DATA = model-config dist_xpc_DATA = model-config

3
XpConfig/C/print/models/CANONC3200-PS/Makefile.am
View File

@ -2,5 +2,4 @@ SUBDIRS = fonts
xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS
xpc_DATA = model-config dist_xpc_DATA = model-config

3
XpConfig/C/print/models/GSdefault/Makefile.am
View File

@ -1,4 +1,3 @@
xpcdir = @xpconfigdir@/C/print/models/GSdefault xpcdir = @xpconfigdir@/C/print/models/GSdefault
xpc_DATA = model-config dist_xpc_DATA = model-config

3
XpConfig/C/print/models/HPLJ4050-PS/Makefile.am
View File

@ -2,5 +2,4 @@ SUBDIRS = fonts
xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS
xpc_DATA = model-config dist_xpc_DATA = model-config

2
XpConfig/C/print/models/HPLJ4family/Makefile.am
View File

@ -2,4 +2,4 @@ SUBDIRS = fonts
xpcdir = @xpconfigdir@/C/print/models/HPLJ4family xpcdir = @xpconfigdir@/C/print/models/HPLJ4family
xpc_DATA = model-config dist_xpc_DATA = model-config

2
XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am
View File

@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/HPLJ4family/fonts xpcdir = @xpconfigdir@/C/print/models/HPLJ4family/fonts
xpc_DATA = \ dist_xpc_DATA = \
9nb00051.pmf \ 9nb00051.pmf \
9nb00052.pmf \ 9nb00052.pmf \
9nb00053.pmf \ 9nb00053.pmf \

2
XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
View File

@ -1,3 +1,3 @@
xpcdir = @xpconfigdir@/C/print/models/PS2PDFspooldir-GS xpcdir = @xpconfigdir@/C/print/models/PS2PDFspooldir-GS
xpc_DATA = model-config ps2pdf_spooltodir.sh dist_xpc_DATA = model-config ps2pdf_spooltodir.sh

2
XpConfig/C/print/models/PSdefault/Makefile.am
View File

@ -2,7 +2,7 @@ SUBDIRS = fonts
xpcdir = @xpconfigdir@/C/print/models/PSdefault xpcdir = @xpconfigdir@/C/print/models/PSdefault
xpc_DATA = model-config dist_xpc_DATA = model-config
install-data-hook: install-data-hook:
@rm -f $(xpcdir)/fonts.scale @rm -f $(xpcdir)/fonts.scale

2
XpConfig/C/print/models/PSdefault/fonts/Makefile.am
View File

@ -1,6 +1,6 @@
xpcdir = @xpconfigdir@/C/print/models/PSdefault/fonts xpcdir = @xpconfigdir@/C/print/models/PSdefault/fonts
xpc_DATA = \ dist_xpc_DATA = \
AvantGarde-BookOblique.pmf \ AvantGarde-BookOblique.pmf \
AvantGarde-Book.pmf \ AvantGarde-Book.pmf \
AvantGarde-DemiOblique.pmf \ AvantGarde-DemiOblique.pmf \

2
XpConfig/C/print/models/PSspooldir/Makefile.am
View File

@ -1,3 +1,3 @@
xpcdir = @xpconfigdir@/C/print/models/PSspooldir xpcdir = @xpconfigdir@/C/print/models/PSspooldir
xpc_DATA = model-config dist_xpc_DATA = model-config

2
XpConfig/C/print/models/SPSPARC2/Makefile.am
View File

@ -2,4 +2,4 @@ SUBDIRS = fonts
xpcdir = @xpconfigdir@/C/print/models/SPSPARC2 xpcdir = @xpconfigdir@/C/print/models/SPSPARC2
xpc_DATA = model-config dist_xpc_DATA = model-config

2
XpConfig/en_US/print/attributes/Makefile.am
View File

@ -1,3 +1,3 @@
xpcdir = @xpconfigdir@/en_US/print/attributes xpcdir = @xpconfigdir@/en_US/print/attributes
xpc_DATA = document dist_xpc_DATA = document

2
hw/xfree86/dummylib/Makefile.am
View File

@ -47,4 +47,4 @@ libdummy_nonserver_a_SOURCES = \
xf86verbose.c \ xf86verbose.c \
$(srcdir)/../os-support/shared/sigiostubs.c $(srcdir)/../os-support/shared/sigiostubs.c
EXTRA_DIST = README EXTRA_DIST = README dummylib.h

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

@ -49,27 +49,41 @@ CURSESDEFINES = -DHAS_NCURSES
endif endif
xorgcfg_SOURCES = \ xorgcfg_SOURCES = \
accessx.c\ accessx.c \
card-cfg.c\ card-cfg.c \
cards.c\ cards.c \
config.c\ config.c \
expert.c\ expert.c \
help.c\ help.c \
interface.c\ interface.c \
keyboard-cfg.c\ keyboard-cfg.c \
$(LDSRCS) \ $(LDSRCS) \
monitor-cfg.c\ monitor-cfg.c \
mouse-cfg.c\ mouse-cfg.c \
options.c\ options.c \
screen-cfg.c\ screen-cfg.c \
screen.c\ screen.c \
$(SNPRINTFSRCS)\ $(SNPRINTFSRCS) \
startx.c\ startx.c \
$(STRLSRCS)\ $(STRLSRCS) \
stubs.c\ stubs.c \
$(TEXTSRC)\ $(TEXTSRC) \
vidmode.c\ vidmode.c \
xf86config.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 XBMdir = $(includedir)/X11/bitmaps
XPMdir = $(includedir)/X11/pixmaps XPMdir = $(includedir)/X11/pixmaps
@ -125,4 +139,5 @@ CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
dist_man1_MANS = \ dist_man1_MANS = \
xorgcfg.man xorgcfg.man
EXTRA_DIST = $(XBM_DATA) $(XPM_DATA) XOrgCfg.pre
endif endif

2
hw/xfree86/utils/xorgconfig/Makefile.am
View File

@ -29,7 +29,7 @@
bin_PROGRAMS = xorgconfig bin_PROGRAMS = xorgconfig
X11dir = $(libdir)/X11 X11dir = $(libdir)/X11
X11_DATA = Cards dist_X11_DATA = Cards
xorgconfig_CFLAGS = $(DEP_CFLAGS) \ xorgconfig_CFLAGS = $(DEP_CFLAGS) \
-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \ -DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \