diff options
Diffstat (limited to 'xorg-server/os/Makefile.am')
| -rw-r--r-- | xorg-server/os/Makefile.am | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/xorg-server/os/Makefile.am b/xorg-server/os/Makefile.am index d1815e1df..ef9ecddcf 100644 --- a/xorg-server/os/Makefile.am +++ b/xorg-server/os/Makefile.am @@ -1,57 +1,57 @@ -noinst_LTLIBRARIES = libos.la
-
-AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_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 \
- backtrace.c \
- client.c \
- connection.c \
- io.c \
- mitauth.c \
- oscolor.c \
- osdep.h \
- osinit.c \
- utils.c \
- strcasecmp.c \
- strcasestr.c \
- xdmauth.c \
- xsha1.c \
- xstrans.c \
- xprintf.c \
- $(XORG_SRCS)
-libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS)
-
-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 SPECIAL_DTRACE_OBJECTS
-# Generate dtrace object code for probes in libos & libdix
-dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
- $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
-
-noinst_PROGRAMS = os.O
-
-os_O_SOURCES =
-os.O: dtrace.o $(am_libos_la_OBJECTS)
- $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
-endif
+noinst_LTLIBRARIES = libos.la + +AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_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 \ + backtrace.c \ + client.c \ + connection.c \ + io.c \ + mitauth.c \ + oscolor.c \ + osdep.h \ + osinit.c \ + utils.c \ + strcasecmp.c \ + strcasestr.c \ + xdmauth.c \ + xsha1.c \ + xstrans.c \ + xprintf.c \ + $(XORG_SRCS) +libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) + +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 SPECIAL_DTRACE_OBJECTS +# Generate dtrace object code for probes in libos & libdix +dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) + $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o + +noinst_PROGRAMS = os.O + +os_O_SOURCES = +os.O: dtrace.o $(am_libos_la_OBJECTS) + $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o +endif |