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

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.
This commit is contained in:
Bernhard Rosenkraenzer 2006-11-04 18:59:39 +02:00 committed by Daniel Stone
parent f72927d26c
commit 8deaaa312a
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/os-support/linux/Makefile.am
View File

@ -12,12 +12,12 @@ PLATFORM_PCI_SUPPORT = lnx_ev56.c \
endif endif
if LNXACPI if LNXACPI
ACPI_SOURCES = lnx_acpi.c lnx_apm.c ACPI_SRCS = lnx_acpi.c lnx_apm.c
XORG_CFLAGS += -DHAVE_ACPI XORG_CFLAGS += -DHAVE_ACPI
endif endif
if LNXAPM if LNXAPM
APM_SOURCES = lnx_apm.c APM_SRCS = lnx_apm.c
XORG_CFLAGS += -DHAVE_APM XORG_CFLAGS += -DHAVE_APM
endif endif
@ -30,8 +30,8 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_mouse.c \
$(srcdir)/../shared/sigio.c \ $(srcdir)/../shared/sigio.c \
$(srcdir)/../shared/stdResource.c \ $(srcdir)/../shared/stdResource.c \
$(srcdir)/../shared/libc_wrapper.c \ $(srcdir)/../shared/libc_wrapper.c \
$(ACPI_SOURCES) \ $(ACPI_SRCS) \
$(APM_SOURCES) \ $(APM_SRCS) \
$(PLATFORM_PCI_SUPPORT) $(PLATFORM_PCI_SUPPORT)
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) 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 INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
# FIXME: These need to be added to the build # FIXME: These need to be added to the build
LNX_EXTRA_SOURCES = \ LNX_EXTRA_SRCS = \
lnx_font.c \ lnx_font.c \
lnx_jstk.c \ lnx_jstk.c \
lnxResource.c lnxResource.c
EXTRA_DIST = \ EXTRA_DIST = \
$(LNX_EXTRA_SOURCES) \ $(LNX_EXTRA_SRCS) \
lnx.h \ lnx.h \
$(srcdir)/../shared/xf86Axp.h $(srcdir)/../shared/xf86Axp.h

14
hw/xfree86/os-support/misc/Makefile.am
View File

@ -1,18 +1,18 @@
# FIXME: Add the *.S files to build when applicable # FIXME: Add the *.S files to build when applicable
I386_SOURCES = BUSmemcpy.S IODelay.S SlowBcopy.S I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S
OTHER_SOURCES = BUSmemcpy.c IODelay.c SlowBcopy.c OTHER_SRCS = BUSmemcpy.c IODelay.c SlowBcopy.c
ARCH_SOURCES = $(OTHER_SOURCES) ARCH_SRCS = $(OTHER_SRCS)
# FIXME: Add to the build (NeedPortIO) # FIXME: Add to the build (NeedPortIO)
PORTIO_SOURCES = PortIO.S PORTIO_SRCS = PortIO.S
# FIXME: Add to the build (if HasGcc || HasGcc2) # FIXME: Add to the build (if HasGcc || HasGcc2)
ILHACK_SOURCES = xf86_IlHack.c ILHACK_SRCS = xf86_IlHack.c
noinst_LTLIBRARIES = libmisc.la 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 #AM_LDFLAGS = -r
@ -20,4 +20,4 @@ INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS)
EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS)

26
os/Makefile.am
View File

@ -3,14 +3,14 @@ noinst_LTLIBRARIES = libos.la libcwrapper.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS)
# FIXME: Add support for these in configure.ac # FIXME: Add support for these in configure.ac
K5AUTH_SOURCES = k5auth.c K5AUTH_SRCS = k5auth.c
SECURERPC_SOURCES = rpcauth.c SECURERPC_SRCS = rpcauth.c
INTERNALMALLOC_SOURCES = xalloc.c INTERNALMALLOC_SRCS = xalloc.c
XCSECURITY_SOURCES = secauth.c XCSECURITY_SRCS = secauth.c
XDMCP_SOURCES = xdmcp.c XDMCP_SRCS = xdmcp.c
STRLCAT_SOURCES = strlcat.c strlcpy.c STRLCAT_SRCS = strlcat.c strlcpy.c
XORG_SOURCES = log.c XORG_SRCS = log.c
libos_la_SOURCES = \ libos_la_SOURCES = \
WaitFor.c \ WaitFor.c \
@ -27,18 +27,18 @@ libos_la_SOURCES = \
xdmauth.c \ xdmauth.c \
xstrans.c \ xstrans.c \
xprintf.c \ xprintf.c \
$(XORG_SOURCES) $(XORG_SRCS)
if XCSECURITY if XCSECURITY
libos_la_SOURCES += $(XCSECURITY_SOURCES) libos_la_SOURCES += $(XCSECURITY_SRCS)
endif endif
if XDMCP if XDMCP
libos_la_SOURCES += $(XDMCP_SOURCES) libos_la_SOURCES += $(XDMCP_SRCS)
endif endif
if NEED_STRLCAT if NEED_STRLCAT
libos_la_SOURCES += $(STRLCAT_SOURCES) libos_la_SOURCES += $(STRLCAT_SRCS)
endif endif
libcwrapper_la_SOURCES = \ libcwrapper_la_SOURCES = \
@ -48,8 +48,8 @@ libcwrapper_la_CFLAGS = \
-I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support \
$(AM_CFLAGS) $(AM_CFLAGS)
EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \ EXTRA_DIST = $(K5AUTH_SRCS) $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
$(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(LBX_SOURCES) $(STRLCAT_SOURCES) $(XCSECURITY_SRCS) $(XDMCP_SRCS) $(STRLCAT_SRCS)
if XSERVER_DTRACE if XSERVER_DTRACE
# Generate dtrace object code for probes in libos & libdix # Generate dtrace object code for probes in libos & libdix