diff options
Diffstat (limited to 'xserver/os/Makefile.am')
| -rw-r--r-- | xserver/os/Makefile.am | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/xserver/os/Makefile.am b/xserver/os/Makefile.am index ac3024e5b..d91e8782b 100644 --- a/xserver/os/Makefile.am +++ b/xserver/os/Makefile.am @@ -3,15 +3,14 @@ noinst_LTLIBRARIES = libos.la libcwrapper.la AM_CFLAGS = $(DIX_CFLAGS) # FIXME: Add support for these in configure.ac -K5AUTH_SOURCES = k5auth.c -SECURERPC_SOURCES = rpcauth.c -INTERNALMALLOC_SOURCES = xalloc.c +SECURERPC_SRCS = rpcauth.c +INTERNALMALLOC_SRCS = xalloc.c -XCSECURITY_SOURCES = secauth.c -XDMCP_SOURCES = xdmcp.c -STRLCAT_SOURCES = strlcat.c strlcpy.c -XORG_SOURCES = log.c -PRIVSEP_SOURCES = privsep.c +XCSECURITY_SRCS = secauth.c +XDMCP_SRCS = xdmcp.c +STRLCAT_SRCS = strlcat.c strlcpy.c +XORG_SRCS = log.c +PRIVSEP_SRCS = privsep.c libos_la_SOURCES = \ WaitFor.c \ @@ -28,22 +27,22 @@ libos_la_SOURCES = \ xdmauth.c \ xstrans.c \ xprintf.c \ - $(XORG_SOURCES) + $(XORG_SRCS) if XCSECURITY -libos_la_SOURCES += $(XCSECURITY_SOURCES) +libos_la_SOURCES += $(XCSECURITY_SRCS) endif if XDMCP -libos_la_SOURCES += $(XDMCP_SOURCES) +libos_la_SOURCES += $(XDMCP_SRCS) endif if NEED_STRLCAT -libos_la_SOURCES += $(STRLCAT_SOURCES) +libos_la_SOURCES += $(STRLCAT_SRCS) endif if X_PRIVSEP -libos_la_SOURCES += $(PRIVSEP_SOURCES) +libos_la_SOURCES += $(PRIVSEP_SRCS) endif libcwrapper_la_SOURCES = \ @@ -53,5 +52,21 @@ libcwrapper_la_CFLAGS = \ -I$(top_srcdir)/hw/xfree86/os-support \ $(AM_CFLAGS) -EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \ - $(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(STRLCAT_SOURCES) +EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \ + $(XCSECURITY_SRCS) $(XDMCP_SRCS) $(STRLCAT_SRCS) + +if XSERVER_DTRACE +# Generate dtrace object code for probes in libos & libdix +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_PROGRAMS = os.O + +os.O: dtrace.o $(am_libos_la_OBJECTS) + ld -r -o $@ dtrace.o .libs/*.o +endif + +os.c: + touch $@ + +CLEANFILES = os.c |