diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-03 11:20:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-03 11:20:18 +0000 |
| commit | 46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb (patch) | |
| tree | 2ddc90cb6bc4f04db80d66a334ecaabf139c0176 /xorg-server/hw/xfree86/parser/Makefile.am | |
| parent | 97f3d3043a79d6031787c246a67d2a02ff0a8d08 (diff) | |
| parent | 83a4fe0dc71aafbef11477b284abe530d3877556 (diff) | |
| download | vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.tar.gz vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.tar.bz2 vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/parser/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/parser/Makefile.am b/xorg-server/hw/xfree86/parser/Makefile.am index fb5d49e88..1cd70e7a5 100644 --- a/xorg-server/hw/xfree86/parser/Makefile.am +++ b/xorg-server/hw/xfree86/parser/Makefile.am @@ -1,6 +1,6 @@ if INSTALL_LIBXF86CONFIG noinst_LTLIBRARIES = libxf86config_internal.la -lib_LIBRARIES = libxf86config.a +lib_LTLIBRARIES = libxf86config.la LIBHEADERS = \ xf86Optrec.h \ xf86Parser.h @@ -30,10 +30,11 @@ INTERNAL_SOURCES= \ libxf86config_internal_la_SOURCES = \ $(INTERNAL_SOURCES) -libxf86config_a_SOURCES = \ +libxf86config_la_SOURCES = \ $(top_srcdir)/os/xprintf.c \ $(INTERNAL_SOURCES) -libxf86config_a_CFLAGS = $(AM_CFLAGS) +libxf86config_la_CFLAGS = $(AM_CFLAGS) +libxf86config_la_LDFLAGS = -static AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" \ |