frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable 

module builds to reflect this change.
This commit is contained in:
Kevin E Martin 2005-11-29 16:39:33 +00:00
parent 51a721a6db
commit da5d66f2ff
78 changed files with 358 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
ChangeLog
View File

@ -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> 2005-11-23 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac: * configure.ac:

11
GL/glx/Makefile.am
View File

@ -1,11 +1,18 @@
noinst_LTLIBRARIES = libglx.la 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 # none yet
#sdk_HEADERS = #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 nodist_libglx_la_SOURCES = indirect_size.c indirect_size.h

5
GL/mesa/X/Makefile.am
View File

@ -12,10 +12,11 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../tnl \ -I../tnl \
-I.. \ -I.. \
-I$(top_srcdir)/GL/glx \ -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. # 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 \ libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \ xf86glx_util.c \

5
GL/mesa/array_cache/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libac.la noinst_LTLIBRARIES = libac.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libac_la_SOURCES = ac_context.c ac_import.c nodist_libac_la_SOURCES = ac_context.c ac_import.c

5
GL/mesa/glapi/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libglapi.la noinst_LTLIBRARIES = libglapi.la
AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libglapi_la_SOURCES = glapi.c glthread.c nodist_libglapi_la_SOURCES = glapi.c glthread.c

7
GL/mesa/main/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libmain.la noinst_LTLIBRARIES = libmain.la
AM_CFLAGS = -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
if NEED_VSNPRINTF if NEED_VSNPRINTF
VSNPRINTF_SOURCES = vsnprintf.c VSNPRINTF_SOURCES = vsnprintf.c
@ -37,6 +40,7 @@ nodist_libmain_la_SOURCES = accum.c \
enable.c \ enable.c \
enums.c \ enums.c \
eval.c \ eval.c \
execmem.c \
extensions.c \ extensions.c \
fbobject.c \ fbobject.c \
feedback.c \ feedback.c \
@ -52,6 +56,7 @@ nodist_libmain_la_SOURCES = accum.c \
light.c \ light.c \
lines.c \ lines.c \
matrix.c \ matrix.c \
mm.c \
occlude.c \ occlude.c \
pixel.c \ pixel.c \
points.c \ points.c \

5
GL/mesa/math/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libmath_la_SOURCES = m_debug_clip.c \ nodist_libmath_la_SOURCES = m_debug_clip.c \
m_debug_norm.c \ m_debug_norm.c \

5
GL/mesa/shader/Makefile.am
View File

@ -2,6 +2,8 @@ SUBDIRS = grammar slang
noinst_LTLIBRARIES = libshader.la noinst_LTLIBRARIES = libshader.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -14,7 +16,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libshader_la_SOURCES = arbfragparse.c \ nodist_libshader_la_SOURCES = arbfragparse.c \
arbprogparse.c \ arbprogparse.c \

5
GL/mesa/shader/grammar/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libgrammar.la noinst_LTLIBRARIES = libgrammar.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../../X \ -I../../X \
-I../../array_cache \ -I../../array_cache \
@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../../swrast \ -I../../swrast \
-I../../swrast_setup \ -I../../swrast_setup \
-I../../tnl \ -I../../tnl \
-I../.. -I../.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libgrammar_la_SOURCES = grammar_mesa.c nodist_libgrammar_la_SOURCES = grammar_mesa.c

5
GL/mesa/shader/slang/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libslang.la noinst_LTLIBRARIES = libslang.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../grammar \ -I../grammar \
-I../../X \ -I../../X \
@ -11,7 +13,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../../swrast \ -I../../swrast \
-I../../swrast_setup \ -I../../swrast_setup \
-I../../tnl \ -I../../tnl \
-I../.. -I../.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libslang_la_SOURCES = slang_assemble_assignment.c \ nodist_libslang_la_SOURCES = slang_assemble_assignment.c \
slang_assemble.c \ slang_assemble.c \

5
GL/mesa/swrast/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libswrast.la noinst_LTLIBRARIES = libswrast.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libswrast_la_SOURCES = s_aaline.c \ nodist_libswrast_la_SOURCES = s_aaline.c \
s_aatriangle.c \ s_aatriangle.c \

5
GL/mesa/swrast_setup/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libss.la noinst_LTLIBRARIES = libss.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -10,6 +12,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libss_la_SOURCES = ss_context.c ss_triangle.c nodist_libss_la_SOURCES = ss_context.c ss_triangle.c

5
GL/mesa/tnl/Makefile.am
View File

@ -1,5 +1,7 @@
noinst_LTLIBRARIES = libtnl.la noinst_LTLIBRARIES = libtnl.la
AM_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \
-I../array_cache \ -I../array_cache \
@ -10,7 +12,8 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast \ -I../swrast \
-I../swrast_setup \ -I../swrast_setup \
-I../tnl \ -I../tnl \
-I.. -I.. \
-I$(top_srcdir)/hw/xfree86/os-support
nodist_libtnl_la_SOURCES = t_array_api.c \ nodist_libtnl_la_SOURCES = t_array_api.c \
t_array_import.c \ t_array_import.c \

3
GL/symlink-mesa.sh
View File

@ -122,6 +122,7 @@ symlink_mesa_main() {
action enums.h action enums.h
action eval.c action eval.c
action eval.h action eval.h
action execmem.c
action extensions.c action extensions.c
action extensions.h action extensions.h
action fbobject.c action fbobject.c
@ -153,6 +154,8 @@ symlink_mesa_main() {
action macros.h action macros.h
action matrix.c action matrix.c
action matrix.h action matrix.h
action mm.c
action mm.h
action mtypes.h action mtypes.h
action occlude.c action occlude.c
action occlude.h action occlude.h

10
XTrap/Makefile.am
View File

@ -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 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

45
Xext/Makefile.am
View File

@ -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 sdk_HEADERS = xvdix.h xvmcext.h
@ -95,3 +101,36 @@ libXext_la_SOURCES = \
$(EVI_SRCS) \ $(EVI_SRCS) \
$(MULTIBUFFER_SRCS) \ $(MULTIBUFFER_SRCS) \
$(FONTCACHE_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)

2
Xi/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libXi.la noinst_LTLIBRARIES = libXi.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
libXi_la_SOURCES = \ libXi_la_SOURCES = \
allowev.c \ allowev.c \

4
afb/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libafb.la 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 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 \ afbclip.c afbgetsp.c afbpolypnt.c afbbitblt.c afbcmap.c afbimggblt.c afbpntarea.c \
afbmisc.c afbbstore.c afbtegblt.c $(libafb_gen_sources) 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 EXTRA_DIST = afbline.c afbblt.c afbtile.c README Xdaniver.doc

4
cfb/Makefile.am
View File

@ -9,9 +9,9 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \
libcfb_la_LIBADD = ../mfb/libmfb.la 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 \ EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \ cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \

4
cfb16/Makefile.am
View File

@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) 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@

6
cfb24/Makefile.am
View File

@ -5,7 +5,7 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb24_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) libcfb24_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
EXTRA_DIST = cfbrrop24.h 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

4
cfb32/Makefile.am
View File

@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources) 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@

2
composite/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libcomposite.la noinst_LTLIBRARIES = libcomposite.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
libcomposite_la_SOURCES = \ libcomposite_la_SOURCES = \
compalloc.c \ compalloc.c \

40
configure.ac
View File

@ -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(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(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(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(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(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]) 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 --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
XEXT_INC='-I$(top_srcdir)/Xext' XEXT_INC='-I$(top_srcdir)/Xext'
XEXT_LIB='$(top_builddir)/Xext/libXext.la' XEXT_LIB='$(top_builddir)/Xext/libXext.la'
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
dnl Core modules for most extensions, et al. 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]) AM_CONDITIONAL(XV, [test "x$XV" = xyes])
if test "x$XV" = xyes; then if test "x$XV" = xyes; then
@ -682,7 +684,7 @@ fi
AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes]) AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes])
if test "x$XDMCP" = xyes; then if test "x$XDMCP" = xyes; then
AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol]) AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol])
REQUIRED_MODULES="$REQUIRED_MODULES xdmcp" REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
XDMCP_MODULES="xdmcp" XDMCP_MODULES="xdmcp"
fi fi
@ -690,7 +692,7 @@ AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes])
if test "x$XDMAUTH" = xyes; then if test "x$XDMAUTH" = xyes; then
AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1]) AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])
if ! test "x$XDMCP" = xyes; then if ! test "x$XDMCP" = xyes; then
REQUIRED_MODULES="$REQUIRED_MODULES xdmcp" REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
XDMCP_MODULES="xdmcp" XDMCP_MODULES="xdmcp"
fi fi
fi fi
@ -749,6 +751,7 @@ AC_DEFINE(PIXPRIV, 1, [Support pixmap privates])
DIX_LIB='$(top_builddir)/dix/libdix.la' DIX_LIB='$(top_builddir)/dix/libdix.la'
OS_LIB='$(top_builddir)/os/libos.la' OS_LIB='$(top_builddir)/os/libos.la'
CWRAP_LIB='$(top_builddir)/os/libcwrapper.la'
MI_LIB='$(top_builddir)/mi/libmi.la' MI_LIB='$(top_builddir)/mi/libmi.la'
MINIMI_LIB='$(top_builddir)/mi/libminimi.la' MINIMI_LIB='$(top_builddir)/mi/libminimi.la'
MI_EXT_LIB='$(top_builddir)/mi/libmiext.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' XPSTUBS_LIB='$(top_builddir)/dix/libxpstubs.la'
CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
PKG_CHECK_MODULES([XSERVER], [$REQUIRED_MODULES]) PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
XSERVER_LIBS="${XSERVER_LIBS} -lm -lz" 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 dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so
@ -783,6 +790,9 @@ dnl ---------------------------------------------------------------------------
dnl DDX section. dnl DDX section.
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl These are used to define Xorg module and loader defines
MODULE_DEFINES=""
LOADER_DEFINES=""
dnl DMX DDX dnl DMX DDX
@ -800,7 +810,7 @@ if test "x$DMX" = xyes; then
modules not found.]) modules not found.])
fi fi
DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" 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]) AC_SUBST([XDMX_LIBS])
dnl USB sources in DMX require <linux/input.h> dnl USB sources in DMX require <linux/input.h>
@ -839,7 +849,7 @@ AC_MSG_RESULT([$XVFB])
AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
if test "x$XVFB" = xyes; then 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]) AC_SUBST([XVFB_LIBS])
fi fi
@ -855,7 +865,7 @@ AC_MSG_RESULT([$XNEST])
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then 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]) AC_SUBST([XNEST_LIBS])
fi 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_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_INCS="$XORG_DDXINCS $XORG_OSINCS"
XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" 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") 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]) AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
dnl Module defines are used in the Xorg server and the drivers 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" MODULE_DEFINES="-DIN_MODULE -DXFree86Module"
AC_SUBST([MODULE_DEFINES]) LOADER_DEFINES="-DXFree86LOADER"
dnl these only go in xorg-config.h dnl these only go in xorg-config.h
XF86CONFIGFILE="xorg.conf" XF86CONFIGFILE="xorg.conf"
@ -1022,7 +1031,6 @@ if test "x$XORG" = xyes; then
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
AC_DEFINE(XFree86Server, 1, [Building XFree86 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_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) 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(CFB, [test "x$XORG" = xyes])
AM_CONDITIONAL(AFB, [test "x$XORG" = xyes]) AM_CONDITIONAL(AFB, [test "x$XORG" = xyes])
AC_SUBST([MODULE_DEFINES])
AC_SUBST([LOADER_DEFINES])
dnl Xprint DDX dnl Xprint DDX
@ -1069,8 +1079,8 @@ AC_MSG_RESULT([$XPRINT])
if test "x$XPRINT" = xyes; then if test "x$XPRINT" = xyes; then
PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau]) 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_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 $OS_LIB $XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB" 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_CFLAGS])
AC_SUBST([XPRINT_LIBS]) AC_SUBST([XPRINT_LIBS])

2
damageext/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdamageext.la noinst_LTLIBRARIES = libdamageext.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
libdamageext_la_SOURCES = \ libdamageext_la_SOURCES = \
damageext.c \ damageext.c \

13
dbe/Makefile.am
View File

@ -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 sdk_HEADERS = dbestruct.h
@ -9,3 +11,10 @@ libdbe_la_SOURCES = \
midbe.c \ midbe.c \
midbe.h \ midbe.h \
midbestr.h midbestr.h
libdbemodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@
libdbemodule_la_SOURCES = \
dbe.c \
midbe.c \
midbe.h \
midbestr.h

2
dix/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdix.la libxpstubs.la noinst_LTLIBRARIES = libdix.la libxpstubs.la
AM_CFLAGS = $(DIX_CFLAGS) \ AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ \
-DVENDOR_STRING=\""@VENDOR_STRING@"\" \ -DVENDOR_STRING=\""@VENDOR_STRING@"\" \
-DVENDOR_RELEASE="@VENDOR_RELEASE@" -DVENDOR_RELEASE="@VENDOR_RELEASE@"

2
exa/Makefile.am
View File

@ -8,7 +8,7 @@ INCLUDES = \
$(XORG_INCS) \ $(XORG_INCS) \
-I$(srcdir)/../../../miext/cw -I$(srcdir)/../../../miext/cw
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
libexa_la_SOURCES = \ libexa_la_SOURCES = \
exaasync.c \ exaasync.c \

6
fb/Makefile.am
View File

@ -1,6 +1,10 @@
noinst_LTLIBRARIES = libfb.la libfbmmx.la 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 sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h

4
hw/dmx/glxProxy/Makefile.am
View File

@ -37,4 +37,6 @@ AM_CFLAGS = -I$(top_srcdir)/hw/dmx \
-I$(top_builddir)/GL/include \ -I$(top_builddir)/GL/include \
-I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/include \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@ \
@MODULE_DEFINES@ \
-I$(top_srcdir)/hw/xfree86/os-support

2
hw/xfree86/Makefile.am
View File

@ -17,7 +17,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
bin_PROGRAMS = Xorg bin_PROGRAMS = Xorg
AM_CFLAGS = @XORG_CFLAGS@ AM_CFLAGS = @XORG_CFLAGS@ @LOADER_DEFINES@
INCLUDES = @XORG_INCS@ INCLUDES = @XORG_INCS@
Xorg_SOURCES = xorg.c Xorg_SOURCES = xorg.c

2
hw/xfree86/common/Makefile.am
View File

@ -98,4 +98,4 @@ EXTRA_DIST = \
modeline2c.pl \ modeline2c.pl \
$(DISTKBDSOURCES) $(DISTKBDSOURCES)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@

2
hw/xfree86/ddc/Makefile.am
View File

@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
EXTRA_DIST = ddcPriv.h DDC.HOWTO EXTRA_DIST = ddcPriv.h DDC.HOWTO

28
hw/xfree86/dixmods/Makefile.am
View File

@ -11,23 +11,27 @@ XTRAPMOD = libxtrap.la
endif endif
module_LTLIBRARIES = libafb.la \ module_LTLIBRARIES = libafb.la \
libbitmap.la \
libcfb.la \ libcfb.la \
libcfb16.la \ libcfb16.la \
libcfb24.la \ libcfb24.la \
libcfb32.la \ libcfb32.la \
libdbe.la \
libfb.la \ libfb.la \
liblayer.la \ liblayer.la \
libmfb.la \ libmfb.la \
librecord.la \ libshadow.la
libshadow.la \
libfreetype.la \
libtype1.la \
$(GLXMODS) \
$(XTRAPMOD)
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ 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@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
-I$(top_srcdir)/cfb \ -I$(top_srcdir)/cfb \
@ -67,7 +71,7 @@ libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
libcfb32_la_SOURCES = cfb32module.c libcfb32_la_SOURCES = cfb32module.c
libdbe_la_LDFLAGS = -avoid-version 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 libdbe_la_SOURCES = dbemodule.c
libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
@ -88,7 +92,7 @@ libmfb_la_LIBADD = $(top_builddir)/mfb/libmfb.la
libmfb_la_SOURCES = mfbmodule.c libmfb_la_SOURCES = mfbmodule.c
librecord_la_LDFLAGS = -avoid-version 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 librecord_la_SOURCES = recordmod.c
libshadow_la_LDFLAGS = -avoid-version 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 libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
libxtrap_la_LDFLAGS = -avoid-version 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 libxtrap_la_SOURCES = xf86XTrapModule.c
xkb%.c: xkb%.c:

7
hw/xfree86/dixmods/extmod/Makefile.am
View File

@ -1,6 +1,7 @@
sdk_HEADERS = dgaproc.h sdk_HEADERS = dgaproc.h
module_LTLIBRARIES = libextmod.la extsmoduledir = $(moduledir)/extensions
extsmodule_LTLIBRARIES = libextmod.la
if DGA if DGA
DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h
@ -10,7 +11,7 @@ if XV
XV_SRCS = xvmod.c xvmodproc.h XV_SRCS = xvmod.c xvmodproc.h
endif endif
AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE @LOADER_DEFINES@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
-I$(top_srcdir)/mfb \ -I$(top_srcdir)/mfb \
@ -29,4 +30,4 @@ libextmod_la_SOURCES = modinit.c \
xf86vmode.c \ xf86vmode.c \
vidmodeproc.h \ vidmodeproc.h \
$(XV_SRCS) $(XV_SRCS)
libextmod_la_LIBADD = $(top_builddir)/Xext/libXext.la libextmod_la_LIBADD = $(top_builddir)/Xext/libXextmodule.la

3
hw/xfree86/dri/Makefile.am
View File

@ -7,7 +7,8 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_builddir)/GL/include \ -I$(top_builddir)/GL/include \
-I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/include \
-DHAVE_XORG_CONFIG_H \ -DHAVE_XORG_CONFIG_H \
-DXFree86Module -DIN_MODULE \ @MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@DRIPROTO_CFLAGS@ \ @DRIPROTO_CFLAGS@ \
@LIBDRM_CFLAGS@ \ @LIBDRM_CFLAGS@ \
@GL_CFLAGS@ @GL_CFLAGS@

8
hw/xfree86/dummylib/Makefile.am
View File

@ -6,24 +6,18 @@ noinst_LIBRARIES = libdummy.a libdummy-nonserver.a
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
if NEED_STRLCAT
STRL_SRCS = strlcat.c strlcpy.c
endif
libdummy_a_SOURCES = getvalidbios.c \ libdummy_a_SOURCES = getvalidbios.c \
pcitestmulti.c xf86allocscripi.c \ pcitestmulti.c xf86allocscripi.c \
xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \ xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \
xf86getverb.c \ xf86getverb.c \
xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \ xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \
$(STRL_SRCS)
#xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \ #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \
#logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \ #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \
#$(srcdir)/../os-support/shared/sigiostubs.c #$(srcdir)/../os-support/shared/sigiostubs.c
libdummy_nonserver_a_SOURCES = \ libdummy_nonserver_a_SOURCES = \
$(STRL_SRCS) \
fatalerror.c \ fatalerror.c \
getvalidbios.c \ getvalidbios.c \
logvwrite.c \ logvwrite.c \

2
hw/xfree86/exa/Makefile.am
View File

@ -8,7 +8,7 @@ INCLUDES = \
$(XORG_INCS) \ $(XORG_INCS) \
-I$(srcdir)/../../../miext/cw -I$(srcdir)/../../../miext/cw
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
libexa_la_SOURCES = \ libexa_la_SOURCES = \
exaasync.c \ exaasync.c \

5
hw/xfree86/fbdevhw/Makefile.am
View File

@ -1,4 +1,5 @@
module_LTLIBRARIES = libfbdevhw.la linuxmoduledir = $(moduledir)/linux
linuxmodule_LTLIBRARIES = libfbdevhw.la
libfbdevhw_la_LDFLAGS = -avoid-version libfbdevhw_la_LDFLAGS = -avoid-version
@ -10,7 +11,7 @@ endif
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
sdk_HEADERS = fbdevhw.h sdk_HEADERS = fbdevhw.h

5
hw/xfree86/i2c/Makefile.am
View File

@ -1,6 +1,7 @@
module_LTLIBRARIES = libi2c.la
multimediadir = $(moduledir)/multimedia multimediadir = $(moduledir)/multimedia
multimedia_LTLIBRARIES = \ multimedia_LTLIBRARIES = \
libi2c.la \
bt829_drv.la \ bt829_drv.la \
fi1236_drv.la \ fi1236_drv.la \
msp3430_drv.la \ msp3430_drv.la \
@ -14,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
INCLUDES = $(XORG_INCS) 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 sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h

8
hw/xfree86/int10/Makefile.am
View File

@ -2,10 +2,12 @@ module_LTLIBRARIES = libint10.la
sdk_HEADERS = xf86int10.h sdk_HEADERS = xf86int10.h
EXTRA_CFLAGS = @MODULE_DEFINES@ @LOADER_DEFINES@
libint10_la_LDFLAGS = -avoid-version libint10_la_LDFLAGS = -avoid-version
if INT10_VM86 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) INCLUDES = $(XORG_INCS)
libint10_la_SOURCES = \ libint10_la_SOURCES = \
helper_exec.c \ helper_exec.c \
@ -18,14 +20,14 @@ libint10_la_SOURCES = \
endif endif
if INT10_X86EMU 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 INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \ libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
xf86int10.c xf86x86emu.c generic.c x86emu.c xf86int10.c xf86x86emu.c generic.c x86emu.c
endif endif
if INT10_STUB 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 libint10_la_SOURCES = stub.c xf86int10module.c
endif endif

2
hw/xfree86/loader/Makefile.am
View File

@ -7,7 +7,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
-I$(srcdir)/../../../miext/damage -I$(srcdir)/../../../miext/damage
#AM_LDFLAGS = -r #AM_LDFLAGS = -r
AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @LOADER_DEFINES@
if XORG_LOADER_SPARC if XORG_LOADER_SPARC
SPARC_SOURCES = SparcMulDiv.S SPARC_SOURCES = SparcMulDiv.S

2
hw/xfree86/os-support/bsd/Makefile.am
View File

@ -49,7 +49,7 @@ ARCH_SOURCES = \
endif endif
# FIXME: NetBSD Aperture defines (configure.ac) # 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) INCLUDES = $(XORG_INCS)

2
hw/xfree86/os-support/bus/Makefile.am
View File

@ -21,7 +21,7 @@ libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
INCLUDES = $(XORG_INCS) 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 # 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 # there aren't rules to build them all yet. also the AC_SUBST pattern

3
hw/xfree86/os-support/drm/Makefile.am
View File

@ -7,7 +7,8 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/glx \
-I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/include \
-DHAVE_XORG_CONFIG_H \ -DHAVE_XORG_CONFIG_H \
@LIBDRM_CFLAGS@ @LIBDRM_CFLAGS@ \
@LOADER_DEFINES@
libdrm_la_LDFLAGS = -module -avoid-version libdrm_la_LDFLAGS = -module -avoid-version
libdrm_ladir = $(moduledir)/@XORG_OS@ libdrm_ladir = $(moduledir)/@XORG_OS@
libdrm_la_SOURCES = \ libdrm_la_SOURCES = \

2
hw/xfree86/os-support/linux/Makefile.am
View File

@ -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 \ $(srcdir)/../shared/at_scancode.c \
$(PLATFORM_PCI_SUPPORT) $(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 INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack

2
hw/xfree86/os-support/misc/Makefile.am
View File

@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES)

2
hw/xfree86/os-support/solaris/Makefile.am
View File

@ -34,7 +34,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
sdk_HEADERS = agpgart.h sdk_HEADERS = agpgart.h
nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il 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) INCLUDES = $(XORG_INCS)

2
hw/xfree86/parser/Makefile.am
View File

@ -23,7 +23,7 @@ libxf86config_a_SOURCES = \
DRI.c \ DRI.c \
Extensions.c Extensions.c
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
EXTRA_DIST = \ EXTRA_DIST = \
Configint.h \ Configint.h \

2
hw/xfree86/rac/Makefile.am
View File

@ -6,4 +6,4 @@ sdk_HEADERS = xf86RAC.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@

2
hw/xfree86/ramdac/Makefile.am
View File

@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
CURSOR.NOTES CURSOR.NOTES
AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
$(XORG_CFLAGS) $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
xf86BitOrder.c: xf86BitOrder.c:

2
hw/xfree86/scanpci/Makefile.am
View File

@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@
BUILT_SOURCES = xf86PciIds.h BUILT_SOURCES = xf86PciIds.h

2
hw/xfree86/shadowfb/Makefile.am
View File

@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@

7
hw/xfree86/utils/xorgcfg/Makefile.am
View File

@ -48,6 +48,10 @@ TEXTOBJ = text-mode.o
CURSESDEFINES = -DHAS_NCURSES CURSESDEFINES = -DHAS_NCURSES
endif endif
if NEED_STRLCAT
STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
endif
xorgcfg_SOURCES = \ xorgcfg_SOURCES = \
accessx.c \ accessx.c \
card-cfg.c \ card-cfg.c \
@ -83,7 +87,8 @@ xorgcfg_SOURCES = \
screen.h \ screen.h \
stubs.h \ stubs.h \
vidmode.h \ vidmode.h \
xf86config.h xf86config.h \
$(STRL_SRCS)
XBMdir = $(includedir)/X11/bitmaps XBMdir = $(includedir)/X11/bitmaps
XPMdir = $(includedir)/X11/pixmaps XPMdir = $(includedir)/X11/pixmaps

2
hw/xfree86/vbe/Makefile.am
View File

@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
sdk_HEADERS = vbe.h vbeModes.h 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 \ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-I$(srcdir)/../int10 -I$(srcdir)/../int10

2
hw/xfree86/vgahw/Makefile.am
View File

@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la
libvgahw_la_LDFLAGS = -avoid-version libvgahw_la_LDFLAGS = -avoid-version
libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c 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 sdk_HEADERS = vgaHW.h

2
hw/xfree86/x86emu/Makefile.am
View File

@ -11,7 +11,7 @@ libx86emu_a_SOURCES = debug.c \
INCLUDES = INCLUDES =
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @LOADER_DEFINES@
EXTRA_DIST = validate.c \ EXTRA_DIST = validate.c \
x86emu/debug.h \ x86emu/debug.h \

2
hw/xfree86/xaa/Makefile.am
View File

@ -65,4 +65,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) @MODULE_DEFINES@ @LOADER_DEFINES@

3
hw/xfree86/xf1bpp/Makefile.am
View File

@ -60,7 +60,8 @@ libxf1bppmfb_a_SOURCES = \
libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_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 INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb
mfbseg.c: mfbseg.c:

2
hw/xfree86/xf4bpp/Makefile.am
View File

@ -59,4 +59,4 @@ mfbseg.c:
INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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@

2
hw/xfree86/xf8_16bpp/Makefile.am
View File

@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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 libxf8_16bpp_la_LDFLAGS = -avoid-version

2
hw/xfree86/xf8_32bpp/Makefile.am
View File

@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_32.h
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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 libxf8_32bpp_la_LDFLAGS = -avoid-version

2
hw/xfree86/xf8_32wid/Makefile.am
View File

@ -5,7 +5,7 @@ sdk_HEADERS = cfb8_32wid.h
libxf8_32wid_la_LDFLAGS = -avoid-version libxf8_32wid_la_LDFLAGS = -avoid-version
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb 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 = \ libxf8_32wid_la_SOURCES = \
cfb8_32widmodule.c \ cfb8_32widmodule.c \

3
include/xorg-config.h.in
View File

@ -18,9 +18,6 @@
/* Building Xorg server. */ /* Building Xorg server. */
#undef XORGSERVER #undef XORGSERVER
/* Building XFree86 loader. */
#undef XFree86LOADER
/* Current X.Org version. */ /* Current X.Org version. */
#undef XORG_VERSION_CURRENT #undef XORG_VERSION_CURRENT

2
lbx/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = liblbx.la noinst_LTLIBRARIES = liblbx.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
liblbx_la_SOURCES = \ liblbx_la_SOURCES = \
lbxcmap.c \ lbxcmap.c \

4
mfb/Makefile.am
View File

@ -1,6 +1,8 @@
noinst_LTLIBRARIES = libmfb.la 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 \ libmfb_gen_sources = mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \ mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \

2
mi/Makefile.am
View File

@ -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 \ migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
mispans.h miwideline.h mistruct.h mifpoly.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 is for dmx - it has different defines for miinitext.c
libminimi_la_SOURCES = \ libminimi_la_SOURCES = \

4
miext/cw/Makefile.am
View File

@ -1,6 +1,8 @@
noinst_LTLIBRARIES = libcw.la 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 = \ libcw_la_SOURCES = \
cw.c \ cw.c \

4
miext/damage/Makefile.am
View File

@ -1,8 +1,8 @@
noinst_LTLIBRARIES = libdamage.la 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 = \ libdamage_la_SOURCES = \
damage.c \ damage.c \

4
miext/layer/Makefile.am
View File

@ -1,6 +1,8 @@
noinst_LTLIBRARIES = liblayer.la 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 = \ liblayer_la_SOURCES = \
layer.h \ layer.h \

4
miext/shadow/Makefile.am
View File

@ -1,6 +1,8 @@
noinst_LTLIBRARIES = libshadow.la 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 sdk_HEADERS = shadow.h

18
os/Makefile.am
View File

@ -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 # FIXME: Add support for these in configure.ac
K5AUTH_SOURCES = k5auth.c K5AUTH_SOURCES = k5auth.c
@ -19,6 +19,10 @@ if LBX
LBX_SOURCES = lbxio.c LBX_SOURCES = lbxio.c
endif endif
if NEED_STRLCAT
STRLCAT_SOURCES = strlcat.c strlcpy.c
endif
XORG_SOURCES = log.c XORG_SOURCES = log.c
libos_la_SOURCES = \ libos_la_SOURCES = \
@ -38,6 +42,14 @@ libos_la_SOURCES = \
$(XCSECURITY_SOURCES) \ $(XCSECURITY_SOURCES) \
$(XDMCP_SOURCES) \ $(XDMCP_SOURCES) \
$(XORG_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) EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES)

2
randr/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = librandr.la noinst_LTLIBRARIES = librandr.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
librandr_la_SOURCES = \ librandr_la_SOURCES = \
mirandr.c \ mirandr.c \

9
record/Makefile.am
View File

@ -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 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 EXTRA_DIST = set.h

2
render/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = librender.la noinst_LTLIBRARIES = librender.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
librender_la_SOURCES = \ librender_la_SOURCES = \
animcur.c \ animcur.c \

2
xfixes/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libxfixes.la noinst_LTLIBRARIES = libxfixes.la
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@
libxfixes_la_SOURCES = \ libxfixes_la_SOURCES = \
cursor.c \ cursor.c \

2
xkb/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libxkb.la libxkbstubs.la noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
AM_CFLAGS = $(DIX_CFLAGS) \ AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ \
-DHAVE_XKB_CONFIG_H -DHAVE_XKB_CONFIG_H
DDX_SRCS = \ DDX_SRCS = \

2
xorg-server.pc.in
View File

@ -8,5 +8,5 @@ sdkdir=@sdkdir@
Name: xorg-server Name: xorg-server
Description: Modular X.Org X Server Description: Modular X.Org X Server
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Cflags: -I${sdkdir} @MODULE_DEFINES@ Cflags: -I${sdkdir} @MODULE_DEFINES@ @LOADER_DEFINES@
Libs: -L${libdir} Libs: -L${libdir}