[xserver-commit] xizzle/os-support Makefile.am,3.3,3.4
Daniel Stone
xserver-commit@pdx.freedesktop.org
Committed by: daniel
Update of /cvs/xserver/xizzle/os-support
In directory pdx:/tmp/cvs-serv3787/os-support
Modified Files:
Makefile.am
Log Message:
Wow-ee, there go another few screenfuls of errors. Appears .a's can't contain
other .a's - damn!
Makefile.am: link to os-support/ossubdir/os.a directly, ditto
os-support/bus/libxizzlebus.a
os-support/Makefile.am: drop libxizzleos.a
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xizzle/os-support/Makefile.am,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -d -r3.3 -r3.4
--- a/Makefile.am 7 Mar 2004 11:58:13 -0000 3.3
+++ b/Makefile.am 7 Mar 2004 13:12:48 -0000 3.4
@@ -1,14 +1,5 @@
SUBDIRS = bus $(XIZZLE_OS_SUBDIR)
-dummy.c:
- touch dummy.c
-DISTCLEANFILES = dummy.c
-
-lib_LIBRARIES = libxizzleos.a
-libxizzleos_a_SOURCES = dummy.c
-libxizzleos_a_LIBADD = $(XIZZLE_OS_SUBDIR)/libxizzle$(XIZZLE_OS_SUBDIR).a \
- bus/libxizzlebus.a
-
sdk_INCLUDEDIR = $(includedir)/X11/XIZZLESDK
sdk_INCLUDES = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
xf86drmCompat.h assyntax.h