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

Add DIX_CFLAGS to util builds. 

Fixes a build breakage when $(top_srcdir) != $(top_builddir) because
-I$(top_srcdir)/include is missing for the cvt, ioport, pcitweak, and scanpci
builds.

Signed-off-by: Adam Jackson <ajax@nwnk.net>
This commit is contained in:
Aaron Plattner 2006-11-29 12:01:43 -08:00
parent a6381e6984
commit ee9bdd3f4a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
# gah # gah
cvt_SOURCES = cvt.c $(top_srcdir)/hw/xfree86/common/xf86cvt.c cvt_SOURCES = cvt.c $(top_srcdir)/hw/xfree86/common/xf86cvt.c
cvt_CFLAGS = $(XORG_CFLAGS) cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
cvt_LDADD = $(top_builddir)/hw/xfree86/dummylib/libdummy-nonserver.a cvt_LDADD = $(top_builddir)/hw/xfree86/dummylib/libdummy-nonserver.a
man1_MANS = cvt.man man1_MANS = cvt.man

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

@ -33,7 +33,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR) INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
ioport_CFLAGS = $(XORG_CFLAGS) ioport_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
ioport_LDADD = \ ioport_LDADD = \
../../os-support/libxorgos.la \ ../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a \ ../../dummylib/libdummy-nonserver.a \

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

@ -33,7 +33,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR) INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
pcitweak_CFLAGS = $(XORG_CFLAGS) pcitweak_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
pcitweak_LDADD = \ pcitweak_LDADD = \
../../os-support/libxorgos.la \ ../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a \ ../../dummylib/libdummy-nonserver.a \

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

@ -34,7 +34,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib
INCLUDES = $(XORG_INCS) -I$(SCANPCI_SRCDIR) -I$(DUMMYLIB_SRCDIR) INCLUDES = $(XORG_INCS) -I$(SCANPCI_SRCDIR) -I$(DUMMYLIB_SRCDIR)
scanpci_CFLAGS = $(XORG_CFLAGS) scanpci_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
scanpci_LDADD = \ scanpci_LDADD = \
../../scanpci/libscanpci.la \ ../../scanpci/libscanpci.la \
../../os-support/libxorgos.la \ ../../os-support/libxorgos.la \