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

dtrace: Move Xserver.d from dix/ to include/ 

dix/ is typically not in the include path, and this properly belongs in
include anyway since it's needed from os/ too.
This commit is contained in:
Adam Jackson 2019-08-27 15:48:59 -04:00
parent 4fa43fc513
commit 7968d10fad
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/.gitignore vendored
View File

@ -1,3 +1,2 @@
# Add & Override for this directory and it's subdirectories # Add & Override for this directory and it's subdirectories
Xserver-dtrace.h
dix.O dix.O

16
dix/Makefile.am
View File

@ -42,24 +42,16 @@ libdix_la_SOURCES = \
touch.c \ touch.c \
window.c window.c
EXTRA_DIST = buildatoms BuiltInAtoms Xserver.d EXTRA_DIST = buildatoms BuiltInAtoms
# Install list of protocol names # Install list of protocol names
miscconfigdir = $(SERVER_MISC_CONFIG_PATH) miscconfigdir = $(SERVER_MISC_CONFIG_PATH)
dist_miscconfig_DATA = protocol.txt dist_miscconfig_DATA = protocol.txt
if XSERVER_DTRACE
# Generate dtrace header file for C sources to include
BUILT_SOURCES = Xserver-dtrace.h
Xserver-dtrace.h: $(srcdir)/Xserver.d
$(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d
endif
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libdix # Generate dtrace object code for probes in libdix
dtrace-dix.o: $(top_srcdir)/dix/Xserver.d libdix.la dtrace-dix.o: $(top_srcdir)/include/Xserver.d libdix.la
$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/include/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
noinst_PROGRAMS = dix.O noinst_PROGRAMS = dix.O
@ -67,5 +59,3 @@ dix_O_SOURCES =
dix.O: dtrace-dix.o libdix.la dix.O: dtrace-dix.o libdix.la
$(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) $(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
endif endif
CLEANFILES = Xserver-dtrace.h

1
include/.gitignore vendored
View File

@ -2,4 +2,5 @@
*-config.h *-config.h
do-not-use-config.h.in do-not-use-config.h.in
xorg-server.h xorg-server.h
Xserver-dtrace.h

10
include/Makefile.am
View File

@ -84,3 +84,13 @@ EXTRA_DIST = \
xwayland-config.h.meson.in \ xwayland-config.h.meson.in \
xwin-config.h.meson.in \ xwin-config.h.meson.in \
xsha1.h xsha1.h
if XSERVER_DTRACE
# Generate dtrace header file for C sources to include
BUILT_SOURCES = Xserver-dtrace.h
Xserver-dtrace.h: $(srcdir)/Xserver.d
$(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d
endif
CLEANFILES = Xserver-dtrace.h

0
dix/Xserver.d → include/Xserver.d
View File

2
include/probes.h
View File

@ -35,7 +35,7 @@
typedef const char *string; typedef const char *string;
typedef const uint8_t *const_uint8_p; typedef const uint8_t *const_uint8_p;
typedef const double *const_double_p; typedef const double *const_double_p;
#include "../dix/Xserver-dtrace.h" #include "Xserver-dtrace.h"
#endif #endif
#endif /* XORG_PROBES_H */ #endif /* XORG_PROBES_H */

4
os/Makefile.am
View File

@ -58,8 +58,8 @@ EXTRA_DIST = $(SECURERPC_SRCS) $(XDMCP_SRCS)
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS
# Generate dtrace object code for probes in libos & libdix # Generate dtrace object code for probes in libos & libdix
dtrace.o: $(top_srcdir)/dix/Xserver.d libos.la dtrace.o: $(top_srcdir)/include/Xserver.d libos.la
$(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/include/Xserver.d .libs/*.o ../dix/.libs/*.o
noinst_PROGRAMS = os.O noinst_PROGRAMS = os.O