diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2011-06-14 17:21:48 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2011-06-23 05:28:31 -0700 |
| commit | 7d5c8a12cbc295b3e33e1b60bd7330e2bc93a966 (patch) | |
| tree | 3e2ff5e65ff096ccc892c04ad431dd34285192b3 /hw/xfree86 | |
| parent | 8ac651552bb70ba36238f430adab2f7a7f24db6e (diff) | |
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>
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/.gitignore | 2 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 11 | ||||
| -rw-r--r-- | hw/xfree86/os-support/.gitignore | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/Makefile.am | 7 |
4 files changed, 4 insertions, 18 deletions
diff --git a/hw/xfree86/.gitignore b/hw/xfree86/.gitignore index 2ddca49e3..f9b3f4a9f 100644 --- a/hw/xfree86/.gitignore +++ b/hw/xfree86/.gitignore @@ -1,4 +1,2 @@ -libxorg.c Xorg -xorg.c xorg.conf.example diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index f1a759a27..697571e7f 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -38,13 +38,13 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ utils doc man bin_PROGRAMS = Xorg -Xorg_SOURCES = xorg.c +Xorg_SOURCES = AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ noinst_LTLIBRARIES = libxorg.la -libxorg_la_SOURCES = libxorg.c +libxorg_la_SOURCES = libxorg_la_LIBADD = \ $(XSERVER_LIBS) \ loader/libloader.la \ @@ -63,18 +63,13 @@ libxorg_la_LIBADD = \ libxorg_la_DEPENDENCIES = $(libxorg_la_LIBADD) -libxorg.c xorg.c: - touch $@ - -DISTCLEANFILES = libxorg.c xorg.c - Xorg_DEPENDENCIES = libxorg.la Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) BUILT_SOURCES = xorg.conf.example -DISTCLEANFILES += xorg.conf.example +DISTCLEANFILES = xorg.conf.example EXTRA_DIST = xorgconf.cpp if SPECIAL_DTRACE_OBJECTS diff --git a/hw/xfree86/os-support/.gitignore b/hw/xfree86/os-support/.gitignore deleted file mode 100644 index f2206cdd2..000000000 --- a/hw/xfree86/os-support/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Add & Override for this directory and it's subdirectories -xorgos.c diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am index 3af4328ff..348b7ffec 100644 --- a/hw/xfree86/os-support/Makefile.am +++ b/hw/xfree86/os-support/Makefile.am @@ -9,18 +9,13 @@ EXTRA_DIST = int10Defines.h xf86OSpriv.h # as one library, otherwise libtool will actively defeat your attempts to # list them multiple times on the link line. noinst_LTLIBRARIES = libxorgos.la -libxorgos_la_SOURCES = xorgos.c +libxorgos_la_SOURCES = libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \ bus/libbus.la \ misc/libmisc.la AM_CFLAGS = $(DIX_CFLAGS) -xorgos.c: - touch $@ - -DISTCLEANFILES = xorgos.c - # FIXME: These don't seem to be used anywhere EXTRA_DIST += \ shared/bios_devmem.c |