From eb1f861012b6f9972b17f3a1c16de09302feb3df Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 9 Dec 2016 15:18:11 +0530 Subject: [PATCH] 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 --- libs/gst/check/libcheck/Makefile.am | 16 ++++++++-------- libs/gst/check/libcheck/{ => libcompat}/alarm.c | 0 libs/gst/check/libcheck/{ => libcompat}/clock_gettime.c | 0 libs/gst/check/libcheck/{ => libcompat}/libcompat.c | 0 libs/gst/check/libcheck/{ => libcompat}/libcompat.h | 0 libs/gst/check/libcheck/{ => libcompat}/localtime_r.c | 0 libs/gst/check/libcheck/{ => libcompat}/strsignal.c | 0 libs/gst/check/libcheck/{ => libcompat}/timer_create.c | 0 libs/gst/check/libcheck/{ => libcompat}/timer_delete.c | 0 libs/gst/check/libcheck/{ => libcompat}/timer_settime.c | 0 libs/gst/check/libcheck/meson.build | 16 ++++++++++------ 11 files changed, 18 insertions(+), 14 deletions(-) rename libs/gst/check/libcheck/{ => libcompat}/alarm.c (100%) rename libs/gst/check/libcheck/{ => libcompat}/clock_gettime.c (100%) rename libs/gst/check/libcheck/{ => libcompat}/libcompat.c (100%) rename libs/gst/check/libcheck/{ => libcompat}/libcompat.h (100%) rename libs/gst/check/libcheck/{ => libcompat}/localtime_r.c (100%) rename libs/gst/check/libcheck/{ => libcompat}/strsignal.c (100%) rename libs/gst/check/libcheck/{ => libcompat}/timer_create.c (100%) rename libs/gst/check/libcheck/{ => libcompat}/timer_delete.c (100%) rename libs/gst/check/libcheck/{ => libcompat}/timer_settime.c (100%) diff --git a/libs/gst/check/libcheck/Makefile.am b/libs/gst/check/libcheck/Makefile.am index dfa2062..9a00bdc 100644 --- a/libs/gst/check/libcheck/Makefile.am +++ b/libs/gst/check/libcheck/Makefile.am @@ -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) diff --git a/libs/gst/check/libcheck/alarm.c b/libs/gst/check/libcheck/libcompat/alarm.c similarity index 100% rename from libs/gst/check/libcheck/alarm.c rename to libs/gst/check/libcheck/libcompat/alarm.c diff --git a/libs/gst/check/libcheck/clock_gettime.c b/libs/gst/check/libcheck/libcompat/clock_gettime.c similarity index 100% rename from libs/gst/check/libcheck/clock_gettime.c rename to libs/gst/check/libcheck/libcompat/clock_gettime.c diff --git a/libs/gst/check/libcheck/libcompat.c b/libs/gst/check/libcheck/libcompat/libcompat.c similarity index 100% rename from libs/gst/check/libcheck/libcompat.c rename to libs/gst/check/libcheck/libcompat/libcompat.c diff --git a/libs/gst/check/libcheck/libcompat.h b/libs/gst/check/libcheck/libcompat/libcompat.h similarity index 100% rename from libs/gst/check/libcheck/libcompat.h rename to libs/gst/check/libcheck/libcompat/libcompat.h diff --git a/libs/gst/check/libcheck/localtime_r.c b/libs/gst/check/libcheck/libcompat/localtime_r.c similarity index 100% rename from libs/gst/check/libcheck/localtime_r.c rename to libs/gst/check/libcheck/libcompat/localtime_r.c diff --git a/libs/gst/check/libcheck/strsignal.c b/libs/gst/check/libcheck/libcompat/strsignal.c similarity index 100% rename from libs/gst/check/libcheck/strsignal.c rename to libs/gst/check/libcheck/libcompat/strsignal.c diff --git a/libs/gst/check/libcheck/timer_create.c b/libs/gst/check/libcheck/libcompat/timer_create.c similarity index 100% rename from libs/gst/check/libcheck/timer_create.c rename to libs/gst/check/libcheck/libcompat/timer_create.c diff --git a/libs/gst/check/libcheck/timer_delete.c b/libs/gst/check/libcheck/libcompat/timer_delete.c similarity index 100% rename from libs/gst/check/libcheck/timer_delete.c rename to libs/gst/check/libcheck/libcompat/timer_delete.c diff --git a/libs/gst/check/libcheck/timer_settime.c b/libs/gst/check/libcheck/libcompat/timer_settime.c similarity index 100% rename from libs/gst/check/libcheck/timer_settime.c rename to libs/gst/check/libcheck/libcompat/timer_settime.c diff --git a/libs/gst/check/libcheck/meson.build b/libs/gst/check/libcheck/meson.build index f86c187..90f4ba1 100644 --- a/libs/gst/check/libcheck/meson.build +++ b/libs/gst/check/libcheck/meson.build @@ -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) -- 2.7.4