diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.org> | 2006-11-04 18:59:39 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-11-04 19:08:28 +0200 |
| commit | 8deaaa312ad7f9b492a2ae8ad17d74650112c25c (patch) | |
| tree | 8f84c3c1ac733c2588f352b5708c3674b2df1596 /hw | |
| parent | f72927d26cd112d321f7bf187df3c740b3129d22 (diff) | |
automake: avoid use of reserved _SOURCES keyword (bug #8866)
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead. Shuts automake 1.10 up.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/os-support/linux/Makefile.am | 12 | ||||
| -rw-r--r-- | hw/xfree86/os-support/misc/Makefile.am | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 9e09fb610..caf600787 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -12,12 +12,12 @@ PLATFORM_PCI_SUPPORT = lnx_ev56.c \ endif if LNXACPI -ACPI_SOURCES = lnx_acpi.c lnx_apm.c +ACPI_SRCS = lnx_acpi.c lnx_apm.c XORG_CFLAGS += -DHAVE_ACPI endif if LNXAPM -APM_SOURCES = lnx_apm.c +APM_SRCS = lnx_apm.c XORG_CFLAGS += -DHAVE_APM endif @@ -30,8 +30,8 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_mouse.c \ $(srcdir)/../shared/sigio.c \ $(srcdir)/../shared/stdResource.c \ $(srcdir)/../shared/libc_wrapper.c \ - $(ACPI_SOURCES) \ - $(APM_SOURCES) \ + $(ACPI_SRCS) \ + $(APM_SRCS) \ $(PLATFORM_PCI_SUPPORT) AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) @@ -39,12 +39,12 @@ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack # FIXME: These need to be added to the build -LNX_EXTRA_SOURCES = \ +LNX_EXTRA_SRCS = \ lnx_font.c \ lnx_jstk.c \ lnxResource.c EXTRA_DIST = \ - $(LNX_EXTRA_SOURCES) \ + $(LNX_EXTRA_SRCS) \ lnx.h \ $(srcdir)/../shared/xf86Axp.h diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index f546e1a92..8bec35088 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -1,18 +1,18 @@ # FIXME: Add the *.S files to build when applicable -I386_SOURCES = BUSmemcpy.S IODelay.S SlowBcopy.S -OTHER_SOURCES = BUSmemcpy.c IODelay.c SlowBcopy.c +I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S +OTHER_SRCS = BUSmemcpy.c IODelay.c SlowBcopy.c -ARCH_SOURCES = $(OTHER_SOURCES) +ARCH_SRCS = $(OTHER_SRCS) # FIXME: Add to the build (NeedPortIO) -PORTIO_SOURCES = PortIO.S +PORTIO_SRCS = PortIO.S # FIXME: Add to the build (if HasGcc || HasGcc2) -ILHACK_SOURCES = xf86_IlHack.c +ILHACK_SRCS = xf86_IlHack.c noinst_LTLIBRARIES = libmisc.la -libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES) +libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SRCS) #AM_LDFLAGS = -r @@ -20,4 +20,4 @@ INCLUDES = $(XORG_INCS) AM_CFLAGS = $(XORG_CFLAGS) -EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) +EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS) |