7d0728d6c4
Since commit3ef16dfb98, "dmx: fix linking", linking dmx is broken for me: CCLD Xdmx.exe ../../render/.libs/librender.a(glyph.o): In function `HashGlyph': /wip/xserver/build.x86_64/../render/glyph.c:168: undefined reference to `x_sha1_init' /wip/xserver/build.x86_64/../render/glyph.c:174: undefined reference to `x_sha1_update' /wip/xserver/build.x86_64/../render/glyph.c:177: undefined reference to `x_sha1_update' /wip/xserver/build.x86_64/../render/glyph.c:180: undefined reference to `x_sha1_final' ../../render/.libs/librender.a(mipict.o): In function `miClipPictureReg': /wip/xserver/build.x86_64/../render/mipict.c:233: undefined reference to `pixman_region_n_rects' /wip/xserver/build.x86_64/../render/mipict.c:234: undefined reference to `pixman_region_n_rects' /wip/xserver/build.x86_64/../render/mipict.c:235: undefined reference to `pixman_region_rectangles' /wip/xserver/build.x86_64/../render/mipict.c:236: undefined reference to `pixman_region_rectangles' /wip/xserver/build.x86_64/../render/mipict.c:248: undefined reference to `pixman_region_init' /wip/xserver/build.x86_64/../render/mipict.c:251: undefined reference to `pixman_region_not_empty' /wip/xserver/build.x86_64/../render/mipict.c:261: undefined reference to `pixman_region_not_empty' ../../render/.libs/librender.a(mipict.o): In function `miComputeCompositeRegion': /wip/xserver/build.x86_64/../render/mipict.c:340: undefined reference to `pixman_region_init' The change this was fixing appears to be effectively reverted by542d9f6807, so just revert commit3ef16dfb98. Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Adam Jackson <ajax@redhat.com>
87 lines
2.0 KiB
Makefile
87 lines
2.0 KiB
Makefile
|
|
SUBDIRS = input config examples doc doxygen man
|
|
bin_PROGRAMS = Xdmx
|
|
|
|
if XINERAMA
|
|
PANORAMIX_SRCS = $(top_srcdir)/Xext/panoramiX.c
|
|
endif
|
|
|
|
if GLX
|
|
SUBDIRS += glxProxy
|
|
GLX_LIBS = glxProxy/libglxproxy.a
|
|
GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h
|
|
GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
|
|
GLX_DEFS = @GL_CFLAGS@
|
|
endif
|
|
|
|
AM_CFLAGS = \
|
|
-DHAVE_DMX_CONFIG_H \
|
|
$(DIX_CFLAGS) \
|
|
$(GLX_INCS) \
|
|
$(GLX_DEFS) \
|
|
$(DMX_CFLAGS) \
|
|
@DMXMODULES_CFLAGS@
|
|
|
|
Xdmx_SOURCES = dmx.c \
|
|
dmxcb.c \
|
|
dmxcb.h \
|
|
dmxclient.h \
|
|
dmxcmap.c \
|
|
dmxcmap.h \
|
|
dmx-config.h \
|
|
dmxcursor.c \
|
|
dmxcursor.h \
|
|
dmxdpms.c \
|
|
dmxdpms.h \
|
|
dmxextension.c \
|
|
dmxextension.h \
|
|
dmxfont.c \
|
|
dmxfont.h \
|
|
dmxgc.c \
|
|
dmxgc.h \
|
|
dmxgcops.c \
|
|
dmxgcops.h \
|
|
dmx.h \
|
|
dmxinit.c \
|
|
dmxinit.h \
|
|
dmxinput.c \
|
|
dmxinput.h \
|
|
dmxlog.c \
|
|
dmxlog.h \
|
|
dmxpict.c \
|
|
dmxpict.h \
|
|
dmxpixmap.c \
|
|
dmxpixmap.h \
|
|
dmxprop.c \
|
|
dmxprop.h \
|
|
dmxscrinit.c \
|
|
dmxscrinit.h \
|
|
dmxstat.c \
|
|
dmxstat.h \
|
|
dmxsync.c \
|
|
dmxsync.h \
|
|
dmxvisual.c \
|
|
dmxvisual.h \
|
|
dmxwindow.c \
|
|
dmxwindow.h \
|
|
$(top_srcdir)/mi/miinitext.c \
|
|
$(GLX_SRCS)
|
|
|
|
|
|
#if COMPOSITE
|
|
#Xdmx_SOURCES += fakecw.c
|
|
#endif
|
|
|
|
XDMX_LIBS = \
|
|
$(GLX_LIBS) \
|
|
@XDMX_LIBS@ \
|
|
input/libdmxinput.a \
|
|
config/libdmxconfig.a
|
|
|
|
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
|
Xdmx_DEPENDENCIES= $(XDMX_LIBS)
|
|
Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
|
|
|
relink:
|
|
$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)
|