c8feb73f58
Conflicts: Xext/EVI.c Xext/bigreq.c Xext/cup.c Xext/dpms.c Xext/fontcache.c Xext/mitmisc.c Xext/xcmisc.c Xext/xf86bigfont.c Xext/xtest.c configure.ac dbe/dbe.c hw/darwin/darwin.h hw/darwin/darwinEvents.c hw/darwin/iokit/xfIOKit.h hw/darwin/iokit/xfIOKitCursor.c hw/darwin/quartz/fullscreen/fullscreen.c hw/darwin/quartz/fullscreen/quartzCursor.c hw/darwin/quartz/quartz.c hw/darwin/quartz/quartzCommon.h hw/darwin/quartz/quartzCursor.c hw/darwin/quartz/xpr/dri.c hw/darwin/quartz/xpr/dristruct.h hw/darwin/quartz/xpr/xprCursor.c hw/darwin/quartz/xpr/xprFrame.c hw/xfree86/modes/xf86RandR12.c include/cursor.h miext/rootless/rootlessCommon.h miext/rootless/rootlessScreen.c miext/rootless/rootlessWindow.c render/picturestr.h Trying to pick up the pieces from the darwin churn here...
57 lines
988 B
Makefile
57 lines
988 B
Makefile
noinst_LTLIBRARIES = libos.la
|
|
|
|
AM_CFLAGS = $(DIX_CFLAGS)
|
|
|
|
SECURERPC_SRCS = rpcauth.c
|
|
XDMCP_SRCS = xdmcp.c
|
|
STRLCAT_SRCS = strlcat.c strlcpy.c
|
|
XORG_SRCS = log.c
|
|
|
|
libos_la_SOURCES = \
|
|
WaitFor.c \
|
|
access.c \
|
|
auth.c \
|
|
connection.c \
|
|
io.c \
|
|
mitauth.c \
|
|
oscolor.c \
|
|
oscolor.h \
|
|
osdep.h \
|
|
osinit.c \
|
|
utils.c \
|
|
xdmauth.c \
|
|
xstrans.c \
|
|
xprintf.c \
|
|
$(XORG_SRCS)
|
|
|
|
if SECURE_RPC
|
|
libos_la_SOURCES += $(SECURERPC_SRCS)
|
|
endif
|
|
|
|
if XDMCP
|
|
libos_la_SOURCES += $(XDMCP_SRCS)
|
|
endif
|
|
|
|
if NEED_STRLCAT
|
|
libos_la_SOURCES += $(STRLCAT_SRCS)
|
|
endif
|
|
|
|
EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_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
|