diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-29 16:39:33 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-29 16:39:33 +0000 |
| commit | da5d66f2ff27b21fe5c39a4abb4f627edd707f1d (patch) | |
| tree | ad479b2ead1b745fc1eb056456c2126f8e18f947 /os/Makefile.am | |
| parent | 51a721a6dbb42702347aad3115147e4922fc1a25 (diff) | |
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
Diffstat (limited to 'os/Makefile.am')
| -rw-r--r-- | os/Makefile.am | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/os/Makefile.am b/os/Makefile.am index 105489972..d7b6b29c6 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -1,6 +1,6 @@ -noinst_LTLIBRARIES = libos.la +noinst_LTLIBRARIES = libos.la libcwrapper.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ # FIXME: Add support for these in configure.ac K5AUTH_SOURCES = k5auth.c @@ -19,6 +19,10 @@ if LBX LBX_SOURCES = lbxio.c endif +if NEED_STRLCAT +STRLCAT_SOURCES = strlcat.c strlcpy.c +endif + XORG_SOURCES = log.c libos_la_SOURCES = \ @@ -38,6 +42,14 @@ libos_la_SOURCES = \ $(XCSECURITY_SOURCES) \ $(XDMCP_SOURCES) \ $(XORG_SOURCES) \ - $(LBX_SOURCES) + $(LBX_SOURCES) \ + $(STRLCAT_SOURCES) + +libcwrapper_la_SOURCES = \ + $(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c +libcwrapper_la_CFLAGS = \ + -DSELF_CONTAINED_WRAPPER \ + -I$(top_srcdir)/hw/xfree86/os-support \ + $(AM_CFLAGS) EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) |