diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-10-31 16:05:48 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-11-03 13:13:38 -0800 |
| commit | f1ef85689a47e1d77b3946ae3ba2cb96fbb27457 (patch) | |
| tree | 9124e9313953d2e4ed35af3dabbecdd37124e4b7 /hw | |
| parent | 00e82378398052d365d1b131092e676ede7535d1 (diff) | |
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
(cherry picked from c03311a1e78daa291477a67b1bb7206772108c5d commit)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 64c54f886..72befea19 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -58,12 +58,15 @@ Xorg_LDADD = $(XORG_LIBS) \ 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 # Needs to be built before any files are compiled when using Sun compilers # 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: cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il @@ -84,10 +87,6 @@ endif optionsdir = $(libdir)/X11 dist_options_DATA = Options -BUILT_SOURCES = xorg.conf.example -CLEAN = xorg.conf.example xorg.conf.example.pre -EXTRA_DIST = xorgconf.cpp - CPP_FILES_FLAGS = \ -DRGBPATH=\"$(RGB_DB)\" \ -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ |