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

Fix automake error: BUILT_SOURCES was defined multiple times on Solaris

This commit is contained in:
Alan Coopersmith 2006-10-31 16:05:48 -08:00
parent a2434ec5f3
commit c03311a1e7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/Makefile.am
View File

@ -58,12 +58,15 @@ Xorg_LDADD = $(XORG_LIBS) \
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
BUILT_SOURCES = xorg.conf.example
CLEAN = xorg.conf.example xorg.conf.example.pre
EXTRA_DIST = xorgconf.cpp
if SOLARIS_ASM_INLINE if SOLARIS_ASM_INLINE
# Needs to be built before any files are compiled when using Sun compilers # Needs to be built before any files are compiled when using Sun compilers
# so in*/out* inline definitions are properly processed. # so in*/out* inline definitions are properly processed.
BUILT_SOURCES = os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il BUILT_SOURCES += os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il
os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il: os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il:
cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il
@ -84,10 +87,6 @@ endif
optionsdir = $(libdir)/X11 optionsdir = $(libdir)/X11
dist_options_DATA = Options dist_options_DATA = Options
BUILT_SOURCES = xorg.conf.example
CLEAN = xorg.conf.example xorg.conf.example.pre
EXTRA_DIST = xorgconf.cpp
CPP_FILES_FLAGS = \ CPP_FILES_FLAGS = \
-DRGBPATH=\"$(RGB_DB)\" \ -DRGBPATH=\"$(RGB_DB)\" \
-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \