libcheck: Just move libcompat files to a subdir

Makes it clearer which files are actually used in libcheck and which are used
for cross-platform compatibility. This is going to be especially useful when we
add all the libcompat fallback code that upstream libcheck has which will add
about 6 new files.

https://bugzilla.gnome.org/show_bug.cgi?id=775870
This commit is contained in:
Nirbheek Chauhan 2016-12-09 15:18:11 +05:30
parent 0bb6d590cc
commit eb1f861012
11 changed files with 18 additions and 14 deletions

View file

@ -12,25 +12,25 @@ CFILES =\
check_print.c \
check_run.c \
check_str.c \
libcompat.c
libcompat/libcompat.c
if !HAVE_ALARM
CFILES += alarm.c
CFILES += libcompat/alarm.c
endif
if !HAVE_CLOCK_GETTIME
CFILES += clock_gettime.c
CFILES += libcompat/clock_gettime.c
endif
if !HAVE_STRSIGNAL
CFILES += strsignal.c
CFILES += libcompat/strsignal.c
endif
if !HAVE_TIMER_CREATE_SETTIME_DELETE
CFILES +=\
timer_create.c \
timer_settime.c \
timer_delete.c
libcompat/timer_create.c \
libcompat/timer_settime.c \
libcompat/timer_delete.c
endif
HFILES =\
@ -42,7 +42,7 @@ HFILES =\
check_pack.h \
check_print.h \
check_str.h \
libcompat.h
libcompat/libcompat.h
noinst_HEADERS = $(HFILES)

View file

@ -8,24 +8,28 @@ libcheck_files = [
'check_print.c',
'check_run.c',
'check_str.c',
'libcompat.c'
'libcompat/libcompat.c'
]
if not cdata.has('HAVE_ALARM')
libcheck_files += [ 'alarm.c' ]
libcheck_files += ['libcompat/alarm.c']
endif
if not cdata.has('HAVE_CLOCK_GETTIME')
libcheck_files += [ 'clock_gettime.c' ]
libcheck_files += ['libcompat/clock_gettime.c']
endif
if not cdata.has('HAVE_DECL_STRSIGNAL')
libcheck_files += [ 'strsignal.c' ]
libcheck_files += ['libcompat/strsignal.c']
endif
# FIXME: check for symbols timer_create, timer_settime, timer_delete as well
if not rt_lib.found()
libcheck_files += [ 'timer_create.c', 'timer_settime.c', 'timer_delete.c' ]
libcheck_files += [
'libcompat/timer_create.c',
'libcompat/timer_settime.c',
'libcompat/timer_delete.c'
]
endif
configure_file(input : 'check.h.in',
@ -36,7 +40,7 @@ internal_check_h_inc = include_directories('..')
libcheck = static_library('check',
libcheck_files,
include_directories : [ configinc, internal_check_h_inc ],
include_directories : [configinc, internal_check_h_inc],
dependencies : [rt_lib, mathlib],
c_args: gst_c_args,
pic: true)