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 | |
| parent | 51a721a6dbb42702347aad3115147e4922fc1a25 (diff) | |
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
78 files changed, 359 insertions, 132 deletions
@@ -1,3 +1,84 @@ +2005-11-29 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * GL/glx/Makefile.am: + * GL/mesa/X/Makefile.am: + * GL/mesa/array_cache/Makefile.am: + * GL/mesa/glapi/Makefile.am: + * GL/mesa/main/Makefile.am: + * GL/mesa/math/Makefile.am: + * GL/mesa/shader/Makefile.am: + * GL/mesa/shader/grammar/Makefile.am: + * GL/mesa/shader/slang/Makefile.am: + * GL/mesa/swrast/Makefile.am: + * GL/mesa/swrast_setup/Makefile.am: + * GL/mesa/tnl/Makefile.am: + * GL/symlink-mesa.sh: + * XTrap/Makefile.am: + * Xext/Makefile.am: + * Xi/Makefile.am: + * afb/Makefile.am: + * cfb/Makefile.am: + * cfb16/Makefile.am: + * cfb24/Makefile.am: + * cfb32/Makefile.am: + * composite/Makefile.am: + * configure.ac: + * damageext/Makefile.am: + * dbe/Makefile.am: + * dix/Makefile.am: + * fb/Makefile.am: + * hw/dmx/glxProxy/Makefile.am: + * hw/xfree86/Makefile.am: + * hw/xfree86/common/Makefile.am: + * hw/xfree86/ddc/Makefile.am: + * hw/xfree86/dixmods/Makefile.am: + * hw/xfree86/dixmods/extmod/Makefile.am: + * hw/xfree86/dri/Makefile.am: + * hw/xfree86/dummylib/Makefile.am: + * hw/xfree86/exa/Makefile.am: + * hw/xfree86/fbdevhw/Makefile.am: + * hw/xfree86/i2c/Makefile.am: + * hw/xfree86/int10/Makefile.am: + * hw/xfree86/loader/Makefile.am: + * hw/xfree86/os-support/bsd/Makefile.am: + * hw/xfree86/os-support/bus/Makefile.am: + * hw/xfree86/os-support/drm/Makefile.am: + * hw/xfree86/os-support/linux/Makefile.am: + * hw/xfree86/os-support/misc/Makefile.am: + * hw/xfree86/os-support/solaris/Makefile.am: + * hw/xfree86/parser/Makefile.am: + * hw/xfree86/rac/Makefile.am: + * hw/xfree86/ramdac/Makefile.am: + * hw/xfree86/scanpci/Makefile.am: + * hw/xfree86/shadowfb/Makefile.am: + * hw/xfree86/utils/xorgcfg/Makefile.am: + * hw/xfree86/vbe/Makefile.am: + * hw/xfree86/vgahw/Makefile.am: + * hw/xfree86/x86emu/Makefile.am: + * hw/xfree86/xaa/Makefile.am: + * hw/xfree86/xf1bpp/Makefile.am: + * hw/xfree86/xf4bpp/Makefile.am: + * hw/xfree86/xf8_16bpp/Makefile.am: + * hw/xfree86/xf8_32bpp/Makefile.am: + * hw/xfree86/xf8_32wid/Makefile.am: + * include/xorg-config.h.in: + * lbx/Makefile.am: + * mfb/Makefile.am: + * mi/Makefile.am: + * miext/cw/Makefile.am: + * miext/damage/Makefile.am: + * miext/layer/Makefile.am: + * miext/shadow/Makefile.am: + * os/Makefile.am: + * randr/Makefile.am: + * record/Makefile.am: + * render/Makefile.am: + * xfixes/Makefile.am: + * xkb/Makefile.am: + * xorg-server.pc.in: + Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update + loadable module builds to reflect this change. + 2005-11-23 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am index 8769b602c..8964a9f96 100644 --- a/GL/glx/Makefile.am +++ b/GL/glx/Makefile.am @@ -1,11 +1,18 @@ noinst_LTLIBRARIES = libglx.la -AM_CFLAGS = @DIX_CFLAGS@ @GL_CFLAGS@ @XLIB_CFLAGS@ -I@MESA_SOURCE@/include -DXFree86Server +AM_CFLAGS = \ + @DIX_CFLAGS@ \ + @GL_CFLAGS@ \ + @XLIB_CFLAGS@ \ + -I@MESA_SOURCE@/include \ + -DXFree86Server \ + @MODULE_DEFINES@ \ + @LOADER_DEFINES@ # none yet #sdk_HEADERS = -INCLUDES = -I$(top_srcdir)/GL/include +INCLUDES = -I$(top_srcdir)/GL/include -I$(top_srcdir)/hw/xfree86/os-support nodist_libglx_la_SOURCES = indirect_size.c indirect_size.h diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index 80fa91530..56b62e765 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -12,10 +12,11 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../tnl \ -I.. \ -I$(top_srcdir)/GL/glx \ - -I$(top_srcdir)/GL/include + -I$(top_srcdir)/GL/include \ + -I$(top_srcdir)/hw/xfree86/os-support # terribly gross hack. i need a shower now. -AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server -include dix-config.h +AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@ libX_la_SOURCES = xf86glx.c \ xf86glx_util.c \ diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am index 318941c56..045f12fc1 100644 --- a/GL/mesa/array_cache/Makefile.am +++ b/GL/mesa/array_cache/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libac.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libac_la_SOURCES = ac_context.c ac_import.c diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am index 5deb565a7..9dafab35d 100644 --- a/GL/mesa/glapi/Makefile.am +++ b/GL/mesa/glapi/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libglapi.la +AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libglapi_la_SOURCES = glapi.c glthread.c diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index fe62ff980..50014b11e 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libmain.la +AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support if NEED_VSNPRINTF VSNPRINTF_SOURCES = vsnprintf.c @@ -37,6 +40,7 @@ nodist_libmain_la_SOURCES = accum.c \ enable.c \ enums.c \ eval.c \ + execmem.c \ extensions.c \ fbobject.c \ feedback.c \ @@ -52,6 +56,7 @@ nodist_libmain_la_SOURCES = accum.c \ light.c \ lines.c \ matrix.c \ + mm.c \ occlude.c \ pixel.c \ points.c \ diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am index 0f770032e..1d85fb52e 100644 --- a/GL/mesa/math/Makefile.am +++ b/GL/mesa/math/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libmath.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libmath_la_SOURCES = m_debug_clip.c \ m_debug_norm.c \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index 7827416ae..4d92c783a 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS = grammar slang noinst_LTLIBRARIES = libshader.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -14,7 +16,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libshader_la_SOURCES = arbfragparse.c \ arbprogparse.c \ diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am index 2c97d0bc2..d56a60d51 100644 --- a/GL/mesa/shader/grammar/Makefile.am +++ b/GL/mesa/shader/grammar/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libgrammar.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../../X \ -I../../array_cache \ @@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../../swrast \ -I../../swrast_setup \ -I../../tnl \ - -I../.. + -I../.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libgrammar_la_SOURCES = grammar_mesa.c diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am index 8d0430399..6b072b88b 100644 --- a/GL/mesa/shader/slang/Makefile.am +++ b/GL/mesa/shader/slang/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libslang.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../grammar \ -I../../X \ @@ -11,7 +13,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../../swrast \ -I../../swrast_setup \ -I../../tnl \ - -I../.. + -I../.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libslang_la_SOURCES = slang_assemble_assignment.c \ slang_assemble.c \ diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index b92786d2d..d8d86652f 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libswrast.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libswrast_la_SOURCES = s_aaline.c \ s_aatriangle.c \ diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am index b40dfdcdf..ba09aeed7 100644 --- a/GL/mesa/swrast_setup/Makefile.am +++ b/GL/mesa/swrast_setup/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libss.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libss_la_SOURCES = ss_context.c ss_triangle.c diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index caf02c4b1..1bbc4c4cb 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libtnl.la +AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ -I../array_cache \ @@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I../swrast \ -I../swrast_setup \ -I../tnl \ - -I.. + -I.. \ + -I$(top_srcdir)/hw/xfree86/os-support nodist_libtnl_la_SOURCES = t_array_api.c \ t_array_import.c \ diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh index 1a2439f29..3acff15c5 100755 --- a/GL/symlink-mesa.sh +++ b/GL/symlink-mesa.sh @@ -122,6 +122,7 @@ symlink_mesa_main() { action enums.h action eval.c action eval.h + action execmem.c action extensions.c action extensions.h action fbobject.c @@ -153,6 +154,8 @@ symlink_mesa_main() { action macros.h action matrix.c action matrix.h + action mm.c + action mm.h action mtypes.h action occlude.c action occlude.h diff --git a/XTrap/Makefile.am b/XTrap/Makefile.am index 1eddd4f56..2d8a5f787 100644 --- a/XTrap/Makefile.am +++ b/XTrap/Makefile.am @@ -1,5 +1,11 @@ -noinst_LTLIBRARIES = libxtrap.la +noinst_LTLIBRARIES = libxtrap.la libxtrapmodule.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c + +libxtrapmodule_la_CFLAGS = \ + $(AM_CFLAGS) \ + @MODULE_DEFINES@ \ + -I$(top_srcdir)/hw/xfree86/os-support +libxtrapmodule_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c diff --git a/Xext/Makefile.am b/Xext/Makefile.am index aee6fb84c..de5f6e73d 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -1,8 +1,14 @@ -noinst_LTLIBRARIES = libXext.la +# libXext.la: includes all extensions and should be linked into Xvfb, +# Xnest, Xdmx and Xprt +# libXextbuiltin.la: includes those extensions that are built directly into +# Xorg by default +# libXextmodule.la: includes those extensions that are built into a module +# that Xorg loads +noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la -INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod +INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I$(top_srcdir)/hw/xfree86/os-support -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ sdk_HEADERS = xvdix.h xvmcext.h @@ -95,3 +101,36 @@ libXext_la_SOURCES = \ $(EVI_SRCS) \ $(MULTIBUFFER_SRCS) \ $(FONTCACHE_SRCS) + +libXextbuiltin_la_SOURCES = \ + shape.c \ + sleepuntil.c \ + sleepuntil.h \ + xtest.c \ + xtest1di.c \ + xtest1dd.c \ + xtest1dd.h \ + xf86bigfont.c \ + $(MITSHM_SRCS) \ + $(PANORAMIX_SRCS) \ + $(XCSECURITY_SRCS) \ + $(XEVIE_SRCS) \ + $(XPRINT_SRCS) \ + $(APPGROUP_SRCS) + +libXextmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@ -DEXTMODULE +libXextmodule_la_SOURCES = \ + bigreq.c \ + mitmisc.c \ + shape.c \ + sync.c \ + xcmisc.c \ + dpms.c \ + dpmsproc.h \ + $(XV_SRCS) \ + $(RES_SRCS) \ + $(SCREENSAVER_SRCS) \ + $(CUP_SRCS) \ + $(EVI_SRCS) \ + $(MULTIBUFFER_SRCS) \ + $(FONTCACHE_SRCS) diff --git a/Xi/Makefile.am b/Xi/Makefile.am index fbe438543..5d1cbf97b 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libXi.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ libXi_la_SOURCES = \ allowev.c \ diff --git a/afb/Makefile.am b/afb/Makefile.am index b162bada8..aa99bdd73 100644 --- a/afb/Makefile.am +++ b/afb/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libafb.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c @@ -12,7 +12,7 @@ libafb_la_SOURCES = afbgc.c afbwindow.c afbfont.c afbfillrct.c afbpntwin.c afbpi afbclip.c afbgetsp.c afbpolypnt.c afbbitblt.c afbcmap.c afbimggblt.c afbpntarea.c \ afbmisc.c afbbstore.c afbtegblt.c $(libafb_gen_sources) -INCLUDES = -I$(top_srcdir)/mfb +INCLUDES = -I$(top_srcdir)/mfb -I$(top_srcdir)/hw/xfree86/os-support EXTRA_DIST = afbline.c afbblt.c afbtile.c README Xdaniver.doc diff --git a/cfb/Makefile.am b/cfb/Makefile.am index ad665712d..2385acb36 100644 --- a/cfb/Makefile.am +++ b/cfb/Makefile.am @@ -9,9 +9,9 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \ libcfb_la_LIBADD = ../mfb/libmfb.la -AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) +AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ -INCLUDES = $(CFB_INCLUDES) +INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \ cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \ diff --git a/cfb16/Makefile.am b/cfb16/Makefile.am index 23d42dfb4..1262d386a 100644 --- a/cfb16/Makefile.am +++ b/cfb16/Makefile.am @@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) -INCLUDES = $(CFB_INCLUDES) +INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) +AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/cfb24/Makefile.am b/cfb24/Makefile.am index ab389c69b..e6320e7f0 100644 --- a/cfb24/Makefile.am +++ b/cfb24/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/cfb/Makefile.am.inc libcfb24_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) EXTRA_DIST = cfbrrop24.h - -AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) -INCLUDES = $(CFB_INCLUDES) +AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ + +INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support diff --git a/cfb32/Makefile.am b/cfb32/Makefile.am index 9ebc7166e..8430e3bd7 100644 --- a/cfb32/Makefile.am +++ b/cfb32/Makefile.am @@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) -INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) +INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -AM_CFLAGS = -DPSZ=32 +AM_CFLAGS = -DPSZ=32 @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/composite/Makefile.am b/composite/Makefile.am index 21504e659..a5214fe37 100644 --- a/composite/Makefile.am +++ b/composite/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libcomposite.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ libcomposite_la_SOURCES = \ compalloc.c \ diff --git a/configure.ac b/configure.ac index f834f6f09..c66bf27f1 100644 --- a/configure.ac +++ b/configure.ac @@ -370,7 +370,7 @@ dnl Extensions. AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes]) -AC_ARG_ENABLE(xtrap, AS_HELP_STRING([--enable-xtrap], [Build XTrap extension (default: disabled)]), [XTRAP=$enableval], [XTRAP=no]) +AC_ARG_ENABLE(xtrap, AS_HELP_STRING([--disable-xtrap], [Build XTrap extension (default: enabled)]), [XTRAP=$enableval], [XTRAP=yes]) AC_ARG_ENABLE(record, AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes]) AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes]) AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: enabled)]), [DGA=$enableval], [DGA=yes]) @@ -464,9 +464,11 @@ dnl Extension section dnl --------------------------------------------------------------------------- XEXT_INC='-I$(top_srcdir)/Xext' XEXT_LIB='$(top_builddir)/Xext/libXext.la' +XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' dnl Core modules for most extensions, et al. -REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xfont xproto xtrans xau xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontenc fontsproto inputproto xf86dgaproto" +REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontsproto inputproto xf86dgaproto" +REQUIRED_LIBS="xfont xau fontenc" AM_CONDITIONAL(XV, [test "x$XV" = xyes]) if test "x$XV" = xyes; then @@ -682,7 +684,7 @@ fi AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes]) if test "x$XDMCP" = xyes; then AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol]) - REQUIRED_MODULES="$REQUIRED_MODULES xdmcp" + REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" XDMCP_MODULES="xdmcp" fi @@ -690,7 +692,7 @@ AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes]) if test "x$XDMAUTH" = xyes; then AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1]) if ! test "x$XDMCP" = xyes; then - REQUIRED_MODULES="$REQUIRED_MODULES xdmcp" + REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" XDMCP_MODULES="xdmcp" fi fi @@ -749,6 +751,7 @@ AC_DEFINE(PIXPRIV, 1, [Support pixmap privates]) DIX_LIB='$(top_builddir)/dix/libdix.la' OS_LIB='$(top_builddir)/os/libos.la' +CWRAP_LIB='$(top_builddir)/os/libcwrapper.la' MI_LIB='$(top_builddir)/mi/libmi.la' MINIMI_LIB='$(top_builddir)/mi/libminimi.la' MI_EXT_LIB='$(top_builddir)/mi/libmiext.la' @@ -761,8 +764,12 @@ MIEXT_LAYER_LIB='$(top_builddir)/miext/layer/liblayer.la' XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la' CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' -PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES]) -XSERVER_LIBS="${XSERVER_LIBS} -lm -lz" +PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS]) +PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) + +XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}" +XSERVER_LIBS="${XSERVERLIBS_LIBS} -lm -lz" +AC_SUBST([XSERVER_LIBS]) dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so @@ -783,6 +790,9 @@ dnl --------------------------------------------------------------------------- dnl DDX section. dnl --------------------------------------------------------------------------- +dnl These are used to define Xorg module and loader defines +MODULE_DEFINES="" +LOADER_DEFINES="" dnl DMX DDX @@ -800,7 +810,7 @@ if test "x$DMX" = xyes; then modules not found.]) fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" - XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $OS_LIB $MIEXT_SHADOW_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $CWRAP_LIB $OS_LIB" AC_SUBST([XDMX_LIBS]) dnl USB sources in DMX require <linux/input.h> @@ -839,7 +849,7 @@ AC_MSG_RESULT([$XVFB]) AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) if test "x$XVFB" = xyes; then - XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + XVFB_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" AC_SUBST([XVFB_LIBS]) fi @@ -855,7 +865,7 @@ AC_MSG_RESULT([$XNEST]) AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) if test "x$XNEST" = xyes; then - XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" AC_SUBST([XNEST_LIBS]) fi @@ -881,7 +891,7 @@ if test "x$XORG" = xyes; then XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" - XORG_LIBS="$MI_LIB $FIXES_LIB $XEXT_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl") @@ -1011,9 +1021,8 @@ if test "x$XORG" = xyes; then AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) dnl Module defines are used in the Xorg server and the drivers - dnl Note that this is used in xorg-server.pc.in MODULE_DEFINES="-DIN_MODULE -DXFree86Module" - AC_SUBST([MODULE_DEFINES]) + LOADER_DEFINES="-DXFree86LOADER" dnl these only go in xorg-config.h XF86CONFIGFILE="xorg.conf" @@ -1022,7 +1031,6 @@ if test "x$XORG" = xyes; then AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) - AC_DEFINE(XFree86LOADER, 1, [Building XFree86 loader]) AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) @@ -1061,6 +1069,8 @@ AM_CONDITIONAL(MFB, [test "x$XORG" = xyes]) AM_CONDITIONAL(CFB, [test "x$XORG" = xyes]) AM_CONDITIONAL(AFB, [test "x$XORG" = xyes]) +AC_SUBST([MODULE_DEFINES]) +AC_SUBST([LOADER_DEFINES]) dnl Xprint DDX @@ -1069,8 +1079,8 @@ AC_MSG_RESULT([$XPRINT]) if test "x$XPRINT" = xyes; then PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau]) - XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS" - XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB" + XPRINT_EXTENSIONS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $LBX_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS" + XPRINT_LIBS="$XPRINT_LIBS $DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB" AC_SUBST([XPRINT_CFLAGS]) AC_SUBST([XPRINT_LIBS]) diff --git a/damageext/Makefile.am b/damageext/Makefile.am index 35f7620fb..fd1511894 100644 --- a/damageext/Makefile.am +++ b/damageext/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdamageext.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ libdamageext_la_SOURCES = \ damageext.c \ diff --git a/dbe/Makefile.am b/dbe/Makefile.am index f961d51e0..1a71c98c0 100644 --- a/dbe/Makefile.am +++ b/dbe/Makefile.am @@ -1,6 +1,8 @@ -noinst_LTLIBRARIES = libdbe.la +noinst_LTLIBRARIES = libdbe.la libdbemodule.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ + +INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support sdk_HEADERS = dbestruct.h @@ -9,3 +11,10 @@ libdbe_la_SOURCES = \ midbe.c \ midbe.h \ midbestr.h + +libdbemodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@ +libdbemodule_la_SOURCES = \ + dbe.c \ + midbe.c \ + midbe.h \ + midbestr.h diff --git a/dix/Makefile.am b/dix/Makefile.am index 721d65fd5..d2b533b5a 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdix.la libxpstubs.la -AM_CFLAGS = $(DIX_CFLAGS) \ +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ \ -DVENDOR_STRING=\""@VENDOR_STRING@"\" \ -DVENDOR_RELEASE="@VENDOR_RELEASE@" diff --git a/exa/Makefile.am b/exa/Makefile.am index d3a7edce5..ad5265889 100644 --- a/exa/Makefile.am +++ b/exa/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ $(XORG_INCS) \ -I$(srcdir)/../../../miext/cw -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ libexa_la_SOURCES = \ exaasync.c \ diff --git a/fb/Makefile.am b/fb/Makefile.am index 4797cbae0..e19a8d10c 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -1,6 +1,10 @@ noinst_LTLIBRARIES = libfb.la libfbmmx.la -AM_CFLAGS = $(DIX_CFLAGS) +INCLUDES = \ + -I$(top_srcdir)/hw/xfree86/os-support \ + -I$(top_srcdir)/hw/xfree86/os-support/bus \ + -I$(top_srcdir)/hw/xfree86/common +AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index 78fe186c1..e325b5c8a 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -37,4 +37,6 @@ AM_CFLAGS = -I$(top_srcdir)/hw/dmx \ -I$(top_builddir)/GL/include \ -I@MESA_SOURCE@/include \ -DHAVE_DMX_CONFIG_H \ - @DMXMODULES_CFLAGS@ + @DMXMODULES_CFLAGS@ \ + @MODULE_DEFINES@ \ + -I$(top_srcdir)/hw/xfree86/os-support diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 944042521..89ef3bbe7 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -17,7 +17,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ bin_PROGRAMS = Xorg -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = @XORG_CFLAGS@ @LOADER_DEFINES@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 8c18be5dc..3a2ca19a4 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -98,4 +98,4 @@ EXTRA_DIST = \ modeline2c.pl \ $(DISTKBDSOURCES) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am index 7cfff4763..eb43195a2 100644 --- a/hw/xfree86/ddc/Makefile.am +++ b/hw/xfree86/ddc/Makefile.am @@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ EXTRA_DIST = ddcPriv.h DDC.HOWTO diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index e7b2a264b..68aaea8af 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -11,23 +11,27 @@ XTRAPMOD = libxtrap.la endif module_LTLIBRARIES = libafb.la \ - libbitmap.la \ libcfb.la \ libcfb16.la \ libcfb24.la \ libcfb32.la \ - libdbe.la \ libfb.la \ liblayer.la \ libmfb.la \ - librecord.la \ - libshadow.la \ - libfreetype.la \ - libtype1.la \ - $(GLXMODS) \ - $(XTRAPMOD) - -AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ + libshadow.la + +extsmoduledir = $(moduledir)/extensions +extsmodule_LTLIBRARIES = libdbe.la \ + librecord.la \ + $(GLXMODS) \ + $(XTRAPMOD) + +fontsmoduledir = $(moduledir)/fonts +fontsmodule_LTLIBRARIES = libbitmap.la \ + libfreetype.la \ + libtype1.la + +AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @LOADER_DEFINES@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/afb \ -I$(top_srcdir)/cfb \ @@ -67,7 +71,7 @@ libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la libcfb32_la_SOURCES = cfb32module.c libdbe_la_LDFLAGS = -avoid-version -libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la +libdbe_la_LIBADD = $(top_builddir)/dbe/libdbemodule.la libdbe_la_SOURCES = dbemodule.c libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) @@ -88,7 +92,7 @@ libmfb_la_LIBADD = $(top_builddir)/mfb/libmfb.la libmfb_la_SOURCES = mfbmodule.c librecord_la_LDFLAGS = -avoid-version -librecord_la_LIBADD = $(top_builddir)/record/librecord.la +librecord_la_LIBADD = $(top_builddir)/record/librecordmodule.la librecord_la_SOURCES = recordmod.c libshadow_la_LDFLAGS = -avoid-version @@ -106,7 +110,7 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c libxtrap_la_LDFLAGS = -avoid-version -libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la +libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrapmodule.la libxtrap_la_SOURCES = xf86XTrapModule.c xkb%.c: diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am index 9f3c9ffc8..35b32f6d0 100644 --- a/hw/xfree86/dixmods/extmod/Makefile.am +++ b/hw/xfree86/dixmods/extmod/Makefile.am @@ -1,6 +1,7 @@ sdk_HEADERS = dgaproc.h -module_LTLIBRARIES = libextmod.la +extsmoduledir = $(moduledir)/extensions +extsmodule_LTLIBRARIES = libextmod.la if DGA DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h @@ -10,7 +11,7 @@ if XV XV_SRCS = xvmod.c xvmodproc.h endif -AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE +AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @LOADER_DEFINES@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/afb \ -I$(top_srcdir)/mfb \ @@ -29,4 +30,4 @@ libextmod_la_SOURCES = modinit.c \ xf86vmode.c \ vidmodeproc.h \ $(XV_SRCS) -libextmod_la_LIBADD = $(top_builddir)/Xext/libXext.la +libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 6a3c96170..7740c10b3 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -7,7 +7,8 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_builddir)/GL/include \ -I@MESA_SOURCE@/include \ -DHAVE_XORG_CONFIG_H \ - -DXFree86Module -DIN_MODULE \ + @MODULE_DEFINES@ \ + @LOADER_DEFINES@ \ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@ \ @GL_CFLAGS@ diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am index 74f319ad1..012008573 100644 --- a/hw/xfree86/dummylib/Makefile.am +++ b/hw/xfree86/dummylib/Makefile.am @@ -6,24 +6,18 @@ noinst_LIBRARIES = libdummy.a libdummy-nonserver.a INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) - -if NEED_STRLCAT -STRL_SRCS = strlcat.c strlcpy.c -endif +AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ libdummy_a_SOURCES = getvalidbios.c \ pcitestmulti.c xf86allocscripi.c \ xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \ xf86getverb.c \ xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \ - $(STRL_SRCS) #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \ #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \ #$(srcdir)/../os-support/shared/sigiostubs.c libdummy_nonserver_a_SOURCES = \ - $(STRL_SRCS) \ fatalerror.c \ getvalidbios.c \ logvwrite.c \ diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am index d3a7edce5..ad5265889 100644 --- a/hw/xfree86/exa/Makefile.am +++ b/hw/xfree86/exa/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ $(XORG_INCS) \ -I$(srcdir)/../../../miext/cw -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ libexa_la_SOURCES = \ exaasync.c \ diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am index 3ab56630b..05f78f8d1 100644 --- a/hw/xfree86/fbdevhw/Makefile.am +++ b/hw/xfree86/fbdevhw/Makefile.am @@ -1,4 +1,5 @@ -module_LTLIBRARIES = libfbdevhw.la +linuxmoduledir = $(moduledir)/linux +linuxmodule_LTLIBRARIES = libfbdevhw.la libfbdevhw_la_LDFLAGS = -avoid-version @@ -10,7 +11,7 @@ endif INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ sdk_HEADERS = fbdevhw.h diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am index 00053dd6a..ed9acc184 100644 --- a/hw/xfree86/i2c/Makefile.am +++ b/hw/xfree86/i2c/Makefile.am @@ -1,6 +1,7 @@ +module_LTLIBRARIES = libi2c.la + multimediadir = $(moduledir)/multimedia multimedia_LTLIBRARIES = \ - libi2c.la \ bt829_drv.la \ fi1236_drv.la \ msp3430_drv.la \ @@ -14,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index 47b98b5b3..18174769e 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -2,10 +2,12 @@ module_LTLIBRARIES = libint10.la sdk_HEADERS = xf86int10.h +EXTRA_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@ + libint10_la_LDFLAGS = -avoid-version if INT10_VM86 -AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) +AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) INCLUDES = $(XORG_INCS) libint10_la_SOURCES = \ helper_exec.c \ @@ -18,14 +20,14 @@ libint10_la_SOURCES = \ endif if INT10_X86EMU -AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) +AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS) INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \ xf86int10.c xf86x86emu.c generic.c x86emu.c endif if INT10_STUB -AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) +AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) libint10_la_SOURCES = stub.c xf86int10module.c endif diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index fab3fa906..6e4343df2 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \ -I$(srcdir)/../../../miext/damage #AM_LDFLAGS = -r -AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) +AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @LOADER_DEFINES@ if XORG_LOADER_SPARC SPARC_SOURCES = SparcMulDiv.S diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am index 96eab820d..39c1a9ed6 100644 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ b/hw/xfree86/os-support/bsd/Makefile.am @@ -49,7 +49,7 @@ ARCH_SOURCES = \ endif # FIXME: NetBSD Aperture defines (configure.ac) -AM_CFLAGS = -DUSESTDRES -DUSE_DEV_IO $(XORG_CFLAGS) +AM_CFLAGS = -DUSESTDRES -DUSE_DEV_IO $(XORG_CFLAGS) @LOADER_DEFINES@ INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 7db119fb6..a9a70c9e8 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -21,7 +21,7 @@ libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ # hack to keep all the OS PCI support files in the distball even though # there aren't rules to build them all yet. also the AC_SUBST pattern diff --git a/hw/xfree86/os-support/drm/Makefile.am b/hw/xfree86/os-support/drm/Makefile.am index bc9b078f6..a1f62b62d 100644 --- a/hw/xfree86/os-support/drm/Makefile.am +++ b/hw/xfree86/os-support/drm/Makefile.am @@ -7,7 +7,8 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/include \ -DHAVE_XORG_CONFIG_H \ - @LIBDRM_CFLAGS@ + @LIBDRM_CFLAGS@ \ + @LOADER_DEFINES@ libdrm_la_LDFLAGS = -module -avoid-version libdrm_ladir = $(moduledir)/@XORG_OS@ libdrm_la_SOURCES = \ diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 9dee240a7..554c78d5a 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -22,7 +22,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ $(srcdir)/../shared/at_scancode.c \ $(PLATFORM_PCI_SUPPORT) -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @LOADER_DEFINES@ INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index f546e1a92..29d8489b7 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES) INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am index 6b29b3080..74edc6900 100644 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ b/hw/xfree86/os-support/solaris/Makefile.am @@ -34,7 +34,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) sdk_HEADERS = agpgart.h nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @LOADER_DEFINES@ INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am index acda83d27..7d801e975 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -23,7 +23,7 @@ libxf86config_a_SOURCES = \ DRI.c \ Extensions.c -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ EXTRA_DIST = \ Configint.h \ diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am index b125a1424..9975db4ea 100644 --- a/hw/xfree86/rac/Makefile.am +++ b/hw/xfree86/rac/Makefile.am @@ -6,4 +6,4 @@ sdk_HEADERS = xf86RAC.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am index c9afdad60..4af131345 100644 --- a/hw/xfree86/ramdac/Makefile.am +++ b/hw/xfree86/ramdac/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \ CURSOR.NOTES AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ - $(XORG_CFLAGS) + $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ INCLUDES = $(XORG_INCS) xf86BitOrder.c: diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am index 7e5671aa1..202b984d6 100644 --- a/hw/xfree86/scanpci/Makefile.am +++ b/hw/xfree86/scanpci/Makefile.am @@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ BUILT_SOURCES = xf86PciIds.h diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am index cb5ebb14a..e8e3fd826 100644 --- a/hw/xfree86/shadowfb/Makefile.am +++ b/hw/xfree86/shadowfb/Makefile.am @@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index aba175184..a4b0d9ef4 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -48,6 +48,10 @@ TEXTOBJ = text-mode.o CURSESDEFINES = -DHAS_NCURSES endif +if NEED_STRLCAT +STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c +endif + xorgcfg_SOURCES = \ accessx.c \ card-cfg.c \ @@ -83,7 +87,8 @@ xorgcfg_SOURCES = \ screen.h \ stubs.h \ vidmode.h \ - xf86config.h + xf86config.h \ + $(STRL_SRCS) XBMdir = $(includedir)/X11/bitmaps XPMdir = $(includedir)/X11/pixmaps diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am index 02fdb4837..162029263 100644 --- a/hw/xfree86/vbe/Makefile.am +++ b/hw/xfree86/vbe/Makefile.am @@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c sdk_HEADERS = vbe.h vbeModes.h -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ -I$(srcdir)/../int10 diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am index 2aa27fa41..4038ef427 100644 --- a/hw/xfree86/vgahw/Makefile.am +++ b/hw/xfree86/vgahw/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la libvgahw_la_LDFLAGS = -avoid-version libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ sdk_HEADERS = vgaHW.h diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am index 5959c867a..568eb56e9 100644 --- a/hw/xfree86/x86emu/Makefile.am +++ b/hw/xfree86/x86emu/Makefile.am @@ -11,7 +11,7 @@ libx86emu_a_SOURCES = debug.c \ INCLUDES = -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@ EXTRA_DIST = validate.c \ x86emu/debug.h \ diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am index fb9ebe4b7..593c8724b 100644 --- a/hw/xfree86/xaa/Makefile.am +++ b/hw/xfree86/xaa/Makefile.am @@ -65,4 +65,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am index db5264cb0..47ff33a16 100644 --- a/hw/xfree86/xf1bpp/Makefile.am +++ b/hw/xfree86/xf1bpp/Makefile.am @@ -60,7 +60,8 @@ libxf1bppmfb_a_SOURCES = \ libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) -AM_CFLAGS = -DXF86MONO -include mfbmap.h $(XORG_CFLAGS) +AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) \ + @MODULE_DEFINES@ @LOADER_DEFINES@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb mfbseg.c: diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am index 7a9dc3a9c..fcef297a1 100644 --- a/hw/xfree86/xf4bpp/Makefile.am +++ b/hw/xfree86/xf4bpp/Makefile.am @@ -59,4 +59,4 @@ mfbseg.c: INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am index c800cbbc7..2942c9345 100644 --- a/hw/xfree86/xf8_16bpp/Makefile.am +++ b/hw/xfree86/xf8_16bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ libxf8_16bpp_la_LDFLAGS = -avoid-version diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am index 3050b81d1..8b9329d8c 100644 --- a/hw/xfree86/xf8_32bpp/Makefile.am +++ b/hw/xfree86/xf8_32bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_32.h INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ libxf8_32bpp_la_LDFLAGS = -avoid-version diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am index dfe6e4f92..23f7ecbf3 100644 --- a/hw/xfree86/xf8_32wid/Makefile.am +++ b/hw/xfree86/xf8_32wid/Makefile.am @@ -5,7 +5,7 @@ sdk_HEADERS = cfb8_32wid.h libxf8_32wid_la_LDFLAGS = -avoid-version INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ libxf8_32wid_la_SOURCES = \ cfb8_32widmodule.c \ diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index 08d6e8cb6..147bb813a 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -18,9 +18,6 @@ /* Building Xorg server. */ #undef XORGSERVER -/* Building XFree86 loader. */ -#undef XFree86LOADER - /* Current X.Org version. */ #undef XORG_VERSION_CURRENT diff --git a/lbx/Makefile.am b/lbx/Makefile.am index 0f0efd237..6d7b63a96 100644 --- a/lbx/Makefile.am +++ b/lbx/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = liblbx.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ liblbx_la_SOURCES = \ lbxcmap.c \ diff --git a/mfb/Makefile.am b/mfb/Makefile.am index 95bdabb57..fd3f10eca 100644 --- a/mfb/Makefile.am +++ b/mfb/Makefile.am @@ -1,6 +1,8 @@ noinst_LTLIBRARIES = libmfb.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ + +INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support libmfb_gen_sources = mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \ mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \ diff --git a/mi/Makefile.am b/mi/Makefile.am index 69234833b..add2eb6f4 100644 --- a/mi/Makefile.am +++ b/mi/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \ mispans.h miwideline.h mistruct.h mifpoly.h -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ # libminimi is for dmx - it has different defines for miinitext.c libminimi_la_SOURCES = \ diff --git a/miext/cw/Makefile.am b/miext/cw/Makefile.am index 6b6188b62..2a6b25cb0 100644 --- a/miext/cw/Makefile.am +++ b/miext/cw/Makefile.am @@ -1,6 +1,8 @@ noinst_LTLIBRARIES = libcw.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ + +INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support libcw_la_SOURCES = \ cw.c \ diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am index 093b4587f..44a1a047b 100644 --- a/miext/damage/Makefile.am +++ b/miext/damage/Makefile.am @@ -1,8 +1,8 @@ noinst_LTLIBRARIES = libdamage.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ -INCLUDES = -I$(srcdir)/../cw +INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support libdamage_la_SOURCES = \ damage.c \ diff --git a/miext/layer/Makefile.am b/miext/layer/Makefile.am index fdb4f50c5..f028c53dc 100644 --- a/miext/layer/Makefile.am +++ b/miext/layer/Makefile.am @@ -1,6 +1,8 @@ noinst_LTLIBRARIES = liblayer.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ + +INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support liblayer_la_SOURCES = \ layer.h \ diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am index 5cde81181..b91c00465 100644 --- a/miext/shadow/Makefile.am +++ b/miext/shadow/Makefile.am @@ -1,6 +1,8 @@ noinst_LTLIBRARIES = libshadow.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@ + +INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support sdk_HEADERS = shadow.h 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) diff --git a/randr/Makefile.am b/randr/Makefile.am index 5e1067b70..6da56d911 100644 --- a/randr/Makefile.am +++ b/randr/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = librandr.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ librandr_la_SOURCES = \ mirandr.c \ diff --git a/record/Makefile.am b/record/Makefile.am index 2a64f3189..dbb5ca24b 100644 --- a/record/Makefile.am +++ b/record/Makefile.am @@ -1,7 +1,12 @@ -noinst_LTLIBRARIES = librecord.la +noinst_LTLIBRARIES = librecord.la librecordmodule.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ + +INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support librecord_la_SOURCES = record.c set.c +librecordmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@ +librecordmodule_la_SOURCES = record.c set.c + EXTRA_DIST = set.h diff --git a/render/Makefile.am b/render/Makefile.am index e85f0fef3..9a6d9f5c2 100644 --- a/render/Makefile.am +++ b/render/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = librender.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ librender_la_SOURCES = \ animcur.c \ diff --git a/xfixes/Makefile.am b/xfixes/Makefile.am index 2a95c065b..4bd3b4bde 100644 --- a/xfixes/Makefile.am +++ b/xfixes/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libxfixes.la -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ libxfixes_la_SOURCES = \ cursor.c \ diff --git a/xkb/Makefile.am b/xkb/Makefile.am index 305ce5870..333ca5d44 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la -AM_CFLAGS = $(DIX_CFLAGS) \ +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ \ -DHAVE_XKB_CONFIG_H DDX_SRCS = \ diff --git a/xorg-server.pc.in b/xorg-server.pc.in index 33fb86c1f..cf29ee031 100644 --- a/xorg-server.pc.in +++ b/xorg-server.pc.in @@ -8,5 +8,5 @@ sdkdir=@sdkdir@ Name: xorg-server Description: Modular X.Org X Server Version: @PACKAGE_VERSION@ -Cflags: -I${sdkdir} @MODULE_DEFINES@ +Cflags: -I${sdkdir} @MODULE_DEFINES@ @LOADER_DEFINES@ Libs: -L${libdir} |