47300ed2be
Previously, the server version reported by xdpyinfo and Xorg -version would bear some vague resemblance to a X.Org katamari version, but in the presence of modularization (and client-server relationships with different katamari versions on each side) those numbers don't really make sense. Instead, just report the package version. When branching a stable branch, master's version should be immediately updated to the endpoint of the stable branch plus a snapshot of 1 (for example, 1.4.0.1 after server-1.4-branch). The stable branch should then be changed to RC0 at that time (1.3.99.0, for example). This scheme was partially attempted for server 1.3, but lacked the appropriate master updates, thus why it had to be revisited now. While here, we can also remove a lot of versioning complexity since everything is based on the package version.
65 lines
1.2 KiB
Makefile
65 lines
1.2 KiB
Makefile
noinst_LTLIBRARIES = libdix.la libxpstubs.la
|
|
|
|
AM_CFLAGS = $(DIX_CFLAGS) \
|
|
-DVENDOR_NAME=\""@VENDOR_NAME@"\" \
|
|
-DVENDOR_RELEASE="@VENDOR_RELEASE@"
|
|
|
|
libdix_la_SOURCES = \
|
|
atom.c \
|
|
colormap.c \
|
|
cursor.c \
|
|
devices.c \
|
|
dispatch.c \
|
|
dispatch.h \
|
|
dixfonts.c \
|
|
dixutils.c \
|
|
events.c \
|
|
extension.c \
|
|
ffs.c \
|
|
gc.c \
|
|
getevents.c \
|
|
globals.c \
|
|
glyphcurs.c \
|
|
grabs.c \
|
|
initatoms.c \
|
|
main.c \
|
|
pixmap.c \
|
|
privates.c \
|
|
property.c \
|
|
resource.c \
|
|
swaprep.c \
|
|
swapreq.c \
|
|
tables.c \
|
|
window.c \
|
|
strcasecmp.c
|
|
|
|
libxpstubs_la_SOURCES = \
|
|
xpstubs.c
|
|
|
|
INCLUDES = -I$(top_srcdir)/Xprint
|
|
|
|
EXTRA_DIST = buildatoms BuiltInAtoms CHANGES Xserver.d Xserver-dtrace.h.in
|
|
|
|
if XSERVER_DTRACE
|
|
# Generate dtrace header file for C sources to include
|
|
BUILT_SOURCES = Xserver-dtrace.h
|
|
|
|
Xserver-dtrace.h: $(srcdir)/Xserver.d
|
|
$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
|
|
|| cp Xserver-dtrace.h.in $@
|
|
|
|
# Generate dtrace object code for probes in libdix
|
|
dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
|
|
$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o
|
|
|
|
noinst_PROGRAMS = dix.O
|
|
|
|
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
|
|
ld -r -o $@ .libs/*.o
|
|
endif
|
|
|
|
dix.c:
|
|
touch $@
|
|
|
|
CLEANFILES = dix.c
|