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

Don't use empty source files 

When an empty _SOURCES variable is declared, automake will recognize that
only linking is needed.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dan Nicholson 2011-06-14 17:21:48 -07:00
parent 8ac651552b
commit 7d5c8a12cb
10 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/.gitignore vendored
View File

@ -1,3 +1,2 @@
# Add & Override for this directory and it's subdirectories # Add & Override for this directory and it's subdirectories
dix.c
Xserver-dtrace.h Xserver-dtrace.h

6
dix/Makefile.am
View File

@ -64,11 +64,9 @@ dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
noinst_PROGRAMS = dix.O noinst_PROGRAMS = dix.O
dix_O_SOURCES =
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
$(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) $(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
endif endif
dix.c: CLEANFILES = Xserver-dtrace.h
touch $@
CLEANFILES = dix.c Xserver-dtrace.h

2
hw/xfree86/.gitignore vendored
View File

@ -1,4 +1,2 @@
libxorg.c
Xorg Xorg
xorg.c
xorg.conf.example xorg.conf.example

11
hw/xfree86/Makefile.am
View File

@ -38,13 +38,13 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
utils doc man utils doc man
bin_PROGRAMS = Xorg bin_PROGRAMS = Xorg
Xorg_SOURCES = xorg.c Xorg_SOURCES =
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
INCLUDES = @XORG_INCS@ INCLUDES = @XORG_INCS@
noinst_LTLIBRARIES = libxorg.la noinst_LTLIBRARIES = libxorg.la
libxorg_la_SOURCES = libxorg.c libxorg_la_SOURCES =
libxorg_la_LIBADD = \ libxorg_la_LIBADD = \
$(XSERVER_LIBS) \ $(XSERVER_LIBS) \
loader/libloader.la \ loader/libloader.la \
@ -63,18 +63,13 @@ libxorg_la_LIBADD = \
libxorg_la_DEPENDENCIES = $(libxorg_la_LIBADD) libxorg_la_DEPENDENCIES = $(libxorg_la_LIBADD)
libxorg.c xorg.c:
touch $@
DISTCLEANFILES = libxorg.c xorg.c
Xorg_DEPENDENCIES = libxorg.la Xorg_DEPENDENCIES = libxorg.la
Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
BUILT_SOURCES = xorg.conf.example BUILT_SOURCES = xorg.conf.example
DISTCLEANFILES += xorg.conf.example DISTCLEANFILES = xorg.conf.example
EXTRA_DIST = xorgconf.cpp EXTRA_DIST = xorgconf.cpp
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS

2
hw/xfree86/os-support/.gitignore vendored
View File

@ -1,2 +0,0 @@
# Add & Override for this directory and it's subdirectories
xorgos.c

7
hw/xfree86/os-support/Makefile.am
View File

@ -9,18 +9,13 @@ EXTRA_DIST = int10Defines.h xf86OSpriv.h
# as one library, otherwise libtool will actively defeat your attempts to # as one library, otherwise libtool will actively defeat your attempts to
# list them multiple times on the link line. # list them multiple times on the link line.
noinst_LTLIBRARIES = libxorgos.la noinst_LTLIBRARIES = libxorgos.la
libxorgos_la_SOURCES = xorgos.c libxorgos_la_SOURCES =
libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \ libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \
bus/libbus.la \ bus/libbus.la \
misc/libmisc.la misc/libmisc.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS)
xorgos.c:
touch $@
DISTCLEANFILES = xorgos.c
# FIXME: These don't seem to be used anywhere # FIXME: These don't seem to be used anywhere
EXTRA_DIST += \ EXTRA_DIST += \
shared/bios_devmem.c shared/bios_devmem.c

2
os/.gitignore vendored
View File

@ -1,2 +0,0 @@
# Add & Override for this directory and it's subdirectories
os.c

6
os/Makefile.am
View File

@ -51,11 +51,7 @@ dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
noinst_PROGRAMS = os.O noinst_PROGRAMS = os.O
os_O_SOURCES =
os.O: dtrace.o $(am_libos_la_OBJECTS) os.O: dtrace.o $(am_libos_la_OBJECTS)
$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
endif endif
os.c:
touch $@
CLEANFILES = os.c

1
test/.gitignore vendored
View File

@ -1,4 +1,3 @@
libxservertest.c
xkb xkb
input input
xtest xtest

6
test/Makefile.am
View File

@ -21,6 +21,7 @@ list_LDADD=$(TEST_LDADD)
misc_LDADD=$(TEST_LDADD) misc_LDADD=$(TEST_LDADD)
fixes_LDADD=$(TEST_LDADD) fixes_LDADD=$(TEST_LDADD)
libxservertest_la_SOURCES =
libxservertest_la_LIBADD = \ libxservertest_la_LIBADD = \
$(XSERVER_LIBS) \ $(XSERVER_LIBS) \
$(top_builddir)/hw/xfree86/loader/libloader.la \ $(top_builddir)/hw/xfree86/loader/libloader.la \
@ -39,8 +40,3 @@ libxservertest_la_LIBADD = \
@XORG_LIBS@ @XORG_LIBS@
endif endif
endif endif
CLEANFILES=libxservertest.c
libxservertest.c:
touch $@