diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-23 18:19:17 -0700 |
| commit | 8b6b40b7271acd81a9548f502c18f46f3b640640 (patch) | |
| tree | 1462cb63501a8bdd8845d7c62e038b6a86b78fd5 /os/Makefile.am | |
| parent | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (diff) | |
| parent | 3305d17195e3a0a5555300555bd7703312fa489f (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-reworkpci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
Diffstat (limited to 'os/Makefile.am')
| -rw-r--r-- | os/Makefile.am | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/os/Makefile.am b/os/Makefile.am index c5e7b0397..d2a989782 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -3,9 +3,9 @@ noinst_LTLIBRARIES = libos.la libcwrapper.la AM_CFLAGS = $(DIX_CFLAGS) # FIXME: Add support for these in configure.ac -SECURERPC_SRCS = rpcauth.c INTERNALMALLOC_SRCS = xalloc.c +SECURERPC_SRCS = rpcauth.c XCSECURITY_SRCS = secauth.c XDMCP_SRCS = xdmcp.c STRLCAT_SRCS = strlcat.c strlcpy.c @@ -28,6 +28,10 @@ libos_la_SOURCES = \ xprintf.c \ $(XORG_SRCS) +if SECURE_RPC +libos_la_SOURCES += $(SECURERPC_SRCS) +endif + if XCSECURITY libos_la_SOURCES += $(XCSECURITY_SRCS) endif @@ -59,5 +63,9 @@ 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 |