From 8956f63a941bf0a5f157d47b33e6221601a75040 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 30 Nov 2006 19:53:29 -0800 Subject: [PATCH] Tell automake to STFU about the *.O files automake will not stop whining about the *.O files not being in normal library name format, so just tell automake they are PROGRAMS so it builds them without bitching. --- dix/Makefile.am | 2 +- os/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dix/Makefile.am b/dix/Makefile.am index d0d6e8785..a1f02c1b6 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -52,7 +52,7 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS) $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o -noinst_LIBRARIES = dix.O +noinst_PROGRAMS = dix.O dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) ld -r -o $@ .libs/*.o diff --git a/os/Makefile.am b/os/Makefile.am index 7381797ab..d8d1405ce 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -56,7 +56,7 @@ if XSERVER_DTRACE dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o -noinst_LIBRARIES = os.O +noinst_PROGRAMS = os.O os.O: dtrace.o $(am_libos_la_OBJECTS) ld -r -o $@ dtrace.o .libs/*.o