build: relative header includes, dropping -Isrc/compat and -Isrc/common

Only the generated config.h and the API headers in src/include should be
located via search path now.


git-svn-id: svn://scm.orgis.org/mpg123/trunk@5386 35dc7657-300d-0410-a2e5-dc2837fedb53

Makefile.am

@@ -31,14 +31,7 @@ XFAIL_TESTS =
 check_PROGRAMS =
 
 AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\""
-# That can be trimmed down later when adapting the sources to
+AM_CPPFLAGS += $(LTDLINCL)
-# use relative paths for includes.
-# TODO: Actually do more relative includes.
-AM_CPPFLAGS += \
-  $(LTDLINCL) \
-  -I$(top_srcdir)/src \
-  -I$(top_srcdir)/src/compat \
-  -I$(top_srcdir)/src/common
 
 # Automake cannot handle dependencies behind an autoconf expansion.
 # So we need elaborate ifelsery here to make it see the libtool

NEWS

@@ -2,6 +2,8 @@
 ------
 - build:
 -- Reorganize shared headers, API headers into src/include.
+-- Use relative include paths, avoiding internal directories in
+   CPPFLAGS except for config.h.
 -- Group C99 feature checks and make several standard headers
    mandatory.
 -- Get rid of SIZE_P, OFF_P and friends.

ports/cmake/src/CMakeLists.txt

@@ -341,8 +341,6 @@ option(USE_NEW_HUFFTABLE "use new huffman decoding scheme by Taihei (faster on m
 include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/"
     "${CMAKE_CURRENT_BINARY_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/compat"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common"
     "${CMAKE_CURRENT_SOURCE_DIR}/../../../src/include")
 
 add_compile_definitions(

scripts/fixinc.pl

@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+use File::Basename qw(dirname);
+use File::Spec::Functions qw(abs2rel);
+
+my @incdirs = ('src/common', 'src/compat', 'src');
+
+sub header
+{
+	my ($from, $inc) = @_;
+	for(dirname($from), @incdirs)
+	{
+		my $cand = "$_/$inc";
+		return $cand if -e $cand;
+	}
+	return undef;
+}
+
+for my $f (@ARGV)
+{
+	open(my $ih, '<', $f) or die "meh: $!\n";
+	open(my $oh, '>', "$f.tmp") or die "moh: $!\n";
+	while(my $line = <$ih>)
+	{
+		if($line =~ m,^(\s*\#\s*include\s+)"([^/]+)\"(.*)$,)
+		{
+			my ($pre, $inc, $post) = ($1, $2, $3);
+			my $h = header($f, $inc);
+			if($inc ne "config.h" and defined $h)
+			{
+				if(dirname($h) ne dirname($f))
+				{
+					my $rel = abs2rel($h, dirname($f));
+					print "$f: including $inc ($rel)\n";
+					$line = $pre.'"'.$rel.'"'.$post."\n";
+				}
+			}
+		}
+		print $oh "$line";
+	}
+	rename("$f.tmp", $f);
+}

src/audio.c

@@ -40,7 +40,7 @@
 #include <sys/wait.h>
 #endif
 
-#include "debug.h"
+#include "common/debug.h"
 
 static syn123_handle *sh = NULL;
 static struct mpg123_fmt outfmt = { .encoding=0, .rate=0, .channels=0 };

src/audio.h

@@ -16,7 +16,7 @@
 #ifndef _MPG123_AUDIO_H_
 #define _MPG123_AUDIO_H_
 
-#include "compat.h"
+#include "compat/compat.h"
 #include "mpg123.h"
 #include "out123.h"
 

src/common.c

@@ -18,7 +18,7 @@
 #include "terms.h"
 #include "metaprint.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 enum player_state playstate = STATE_PLAYING;
 const char playsym[STATE_COUNT] = { '>', '_', '=', '?' };

src/compat/compat.c

@@ -39,7 +39,7 @@
 #include <shlwapi.h>
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifndef WINDOWS_UWP
 

src/compat/compat.h

@@ -279,7 +279,7 @@ size_t INT123_unintr_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *st
 #define normal mpg123_normal
 #endif
 
-#include "true.h"
+#include "../common/true.h"
 
 #if (!defined(WIN32) || defined (__CYGWIN__)) && defined(HAVE_SIGNAL_H)
 void (*INT123_catchsignal(int signum, void(*handler)(int)))(int);

src/compat/compat_dl.c

@@ -47,7 +47,7 @@
 #  endif
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #include "wpathconv.h"
 

src/compat/compat_str.c

@@ -26,7 +26,7 @@
 #include <locale.h>
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
 void *INT123_safe_realloc(void *ptr, size_t size)

src/control_generic.c

@@ -21,7 +21,7 @@
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE
 #endif
-#include "compat.h"
+#include "compat/compat.h"
 
 #include "mpg123app.h"
 #include "out123.h"
@@ -60,7 +60,7 @@ static int mode = MODE_STOPPED;
 static int init = 0;
 static int sendstat_disabled = FALSE;
 
-#include "debug.h"
+#include "common/debug.h"
 
 void generic_sendmsg (const char *fmt, ...)
 {

src/equalizer.c

@@ -7,7 +7,7 @@
 */
 
 #include "mpg123app.h"
-#include "debug.h"
+#include "common/debug.h"
 
 /* Load the settings from the path in the global variable equalfile.
    If there is no file, restore equalizer defaults. 

src/filters.c

@@ -9,7 +9,7 @@
 #include "filters.h"
 #include <ctype.h>
 
-#include "debug.h"
+#include "common/debug.h"
 
 // Validate syntax of filter specification, returning the number
 // of configured filters.

src/filters.h

@@ -19,7 +19,7 @@
 #ifndef MPG123_FILTERS_H
 #define MPG123_FILTERS_H
 
-#include "compat.h"
+#include "compat/compat.h"
 
 struct filter
 {

src/getlopt.c

@@ -8,9 +8,9 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "compat/compat.h"
 #include "getlopt.h"
-#include "debug.h"
+#include "common/debug.h"
 
 int loptind = 1;	/* index in argv[] */
 int loptchr = 0;	/* index in argv[loptind] */

src/httpget.c

@@ -34,12 +34,12 @@
 #include "resolver.h"
 
 #include <errno.h>
-#include "true.h"
+#include "common/true.h"
 #endif
 
 #include <ctype.h>
 
-#include "debug.h"
+#include "common/debug.h"
 
 void httpdata_init(struct httpdata *e)
 {

src/libmpg123/calctables.c

@@ -12,7 +12,7 @@
 
 #define CALCTABLES
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #define ASIZE(a) (sizeof(a)/sizeof(*a))
 

src/libmpg123/dither_impl.h

@@ -7,7 +7,7 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include "dither.h"
 
 static const uint32_t init_seed = 2463534242UL;

src/libmpg123/format.c

@@ -26,8 +26,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /* static int chans[NUM_CHANNELS] = { 1 , 2 }; */
 static const long my_rates[MPG123_RATES] = /* only the standard rates */
@@ -686,7 +686,7 @@ static void conv_s16_to_s32(struct outbuffer *buf)
 #endif
 #endif
 
-#include "swap_bytes_impl.h"
+#include "../common/swap_bytes_impl.h"
 
 void swap_endian(struct outbuffer *buf, int block)
 {

src/libmpg123/frame.c

@@ -9,7 +9,7 @@
 #define WANT_GETCPUFLAGS
 #include "mpg123lib_intern.h"
 #include "getcpuflags.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 static void frame_fixed_reset(mpg123_handle *fr);
 

src/libmpg123/gapless.h

@@ -7,7 +7,7 @@
 	This is no stand-alone header, precisely to be able to fool it into using fake handle types for testing the math.
 */
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifdef GAPLESS
 /* From internal sample number to external. */

src/libmpg123/getbits.h

@@ -13,7 +13,7 @@
 #define _MPG123_GETBITS_H_
 
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #define backbits(fr,nob) ((void)( \
   fr->bits_avail  += nob, \

src/libmpg123/icy.h

@@ -10,7 +10,7 @@
 
 #ifndef NO_ICY
 
-#include "compat.h"
+#include "../compat/compat.h"
 #include "mpg123.h"
 
 struct icy_meta

src/libmpg123/icy2utf8.c

@@ -28,7 +28,7 @@
 
 #include "config.h"
 /* Includes string and stdlib headers... */
-#include "compat.h"
+#include "../compat/compat.h"
 
 /* ThOr: too lazy for this type check; also we use char/short all around anyway.
    Of cource, it would be the proper way to use _these_ kind of types all around. */

src/libmpg123/id3.c

@@ -85,7 +85,7 @@
 
 #include "mpg123lib_intern.h"
 #include "id3.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifndef NO_ID3V2 /* Only the main parsing routine will always be there. */
 

src/libmpg123/index.c

@@ -8,7 +8,7 @@
 */
 
 #include "index.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /* The next expected frame offset, one step ahead. */
 static int64_t fi_next(struct frame_index *fi)

src/libmpg123/index.h

@@ -21,7 +21,7 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "../compat/compat.h"
 
 struct frame_index
 {

src/libmpg123/layer1.c

@@ -10,7 +10,7 @@
 
 #include "mpg123lib_intern.h"
 #include "getbits.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /*
 	Allocation value is not allowed to be 15. Initially, libmad showed me the

src/libmpg123/layer3.c

@@ -21,7 +21,7 @@
 #include "huffman.h"
 #endif
 #include "getbits.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 
 

src/libmpg123/lfs_wrap.c

@@ -32,7 +32,7 @@
 #endif
 
 // For correct MPG123_EXPORT.
-#include "abi_align.h"
+#include "../common/abi_align.h"
 
 // Need the full header with non-portable API, for the bare mpg123_open*()
 // declarations. But no renaming shenanigans.
@@ -40,8 +40,8 @@
 #include "mpg123.h"
 
 #include "lfs_wrap.h"
-#include "abi_align.h"
+#include "../common/abi_align.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include <sys/stat.h>
 #include <fcntl.h>
 
@@ -61,7 +61,7 @@
 // A paranoid check that someone did not define a wrong SIZEOF_OFF_T at configure time.
 typedef unsigned char MPG123_STATIC_ASSERT[(SIZEOF_OFF_T == sizeof(off_t)) ? 1 : -1];
 
-#include "debug.h"
+#include "../common/debug.h"
 
 // We do not want to expose this publicly, but it is cleaner to have it also defined
 // as portable API to offer the legacy function wrapper over. It's an undocumented

src/libmpg123/libmpg123.c

@@ -7,19 +7,19 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "version.h"
+#include "../version.h"
 #include "icy2utf8.h"
 
 #include "gapless.h"
 /* Want accurate rounding function regardless of decoder setup. */
 #define FORCE_ACCURATE
-#include "sample.h"
+#include "../common/sample.h"
 #include "parse.h"
 #ifndef PORTABLE_API
 #include "lfs_wrap.h"
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #define SEEKFRAME(mh) ((mh)->ignoreframe < 0 ? 0 : (mh)->ignoreframe)
 

src/libmpg123/mpg123lib_intern.h

@@ -15,9 +15,9 @@
 
 #include "config.h" /* Load this before _anything_ */
 
-#include "abi_align.h"
+#include "../common/abi_align.h"
 
-#include "compat.h"
+#include "../compat/compat.h"
 
 // Only portable API plays a role in the library itself, outside of lfs_wrap.c.
 // Also, we need to ensure no suffix renaming for the primary implementations.
@@ -278,7 +278,7 @@ static inline int32_t scale_rounded(int32_t x, int shift)
    now: factor on minimum frame buffer size (which takes upsampling into account) */
 #define		AUDIOBUFSIZE		2
 
-#include "true.h"
+#include "../common/true.h"
 
 #define         MAX_NAME_SIZE           81
 #define         SBLIMIT                 32

src/libmpg123/ntom.c

@@ -8,7 +8,7 @@
 
 #define SAFE_NTOM /* Do not depend on int64_t*int64_t with big values still being in the range... */
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 int INT123_synth_ntom_set_step(mpg123_handle *fr)
 {

src/libmpg123/optimize.c

@@ -12,7 +12,7 @@
 #define WANT_GETCPUFLAGS
 #include "mpg123lib_intern.h" /* includes optimize.h */
 #include "getcpuflags.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 
 /* Ugly macros to build conditional synth function array values. */

src/libmpg123/parse.c

@@ -30,7 +30,7 @@
 
 #include "mpeghead.h"
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #define bsbufid(fr) (fr)->bsbuf==(fr)->bsspace[0] ? 0 : ((fr)->bsbuf==fr->bsspace[1] ? 1 : ( (fr)->bsbuf==(fr)->bsspace[0]+512 ? 2 : ((fr)->bsbuf==fr->bsspace[1]+512 ? 3 : -1) ) )
 

src/libmpg123/readers.c

@@ -11,7 +11,7 @@
 
 #include "mpg123lib_intern.h"
 
-#include "debug.h"
+#include "../common/debug.h"
 
 static int stream_init(mpg123_handle *fr);
 static int64_t get_fileinfo(mpg123_handle *);

src/libmpg123/stringbuf.c

@@ -10,9 +10,9 @@
 #include "mpg123lib_intern.h"
 #include "config.h"
 #include "mpg123.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include <string.h>
-#include "debug.h"
+#include "../common/debug.h"
 
 mpg123_string* attribute_align_arg mpg123_new_string(const char *val)
 {

src/libmpg123/synth.c

@@ -10,8 +10,8 @@
 #ifdef OPT_GENERIC_DITHER
 #define FORCE_ACCURATE
 #endif
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /*
 	Part 1: All synth functions that produce signed short.

src/libmpg123/synth_8bit.c

@@ -7,8 +7,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /* 
 	Part 2: All synth functions that produce 8bit output.

src/libmpg123/synth_real.c

@@ -7,8 +7,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifdef REAL_IS_FIXED
 #error "Do not build this file with fixed point math!"

src/libmpg123/synth_s32.c

@@ -7,8 +7,8 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifdef REAL_IS_FIXED
 #error "Do not build this file with fixed point math!"

src/libmpg123/system.c

@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "mpg123app.h" <<<--- nope!
+#include "../mpg123app.h" <<<--- nope!
-#include "debug.h"
+#include "../common/debug.h"
 
 static int filept;
 static int verbose = 1;

src/libmpg123/tabinit.c

@@ -7,7 +7,7 @@
 */
 
 #include "mpg123lib_intern.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 // The (normally precomputed) cos tables.
 #include "costabs.h"

src/libout123/buffer.c

@@ -45,7 +45,7 @@
 #endif
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #define BUF_CMD_OPEN     XF_CMD_CUSTOM1
 #define BUF_CMD_CLOSE    XF_CMD_CUSTOM2

src/libout123/buffer.h

@@ -17,7 +17,7 @@
 #define _MPG123_BUFFER_H_
 
 #include "out123_int.h"
-#include "compat.h"
+#include "../compat/compat.h"
 
 int  INT123_buffer_init(out123_handle *ao, size_t bytes);
 void INT123_buffer_exit(out123_handle *ao);

src/libout123/hextxt.c

@@ -19,7 +19,7 @@
 
 #include "out123_int.h"
 #include "hextxt.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 int hex_formats(out123_handle *ao)
 {

src/libout123/legacy_module.c

@@ -7,7 +7,7 @@
 */
 
 #include "out123_int.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /* A single module is staticly compiled in for each type */
 extern mpg123_module_t mpg123_output_module_info;

src/libout123/libout123.c

@@ -32,7 +32,7 @@
 #endif
 #endif
 
-#include "version.h"
+#include "../version.h"
 #include "wav.h"
 #include "hextxt.h"
 #ifndef NOXFERMEM
@@ -44,7 +44,7 @@ static int have_buffer(out123_handle *ao)
 #endif
 #include "stringlists.h"
 
-#include "debug.h"
+#include "../common/debug.h"
 
 const char * attribute_align_arg out123_distversion(unsigned int *major, unsigned int *minor, unsigned int *patch)
 {

src/libout123/module.c

@@ -11,11 +11,11 @@
 #define _BSD_SOURCE
 #include "config.h"
 #include "stringlists.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include <errno.h>
 
 #include "module.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 #ifndef USE_MODULES
 #error This is a build without modules. Why am I here?

src/libout123/modules/aix.c

@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* use AUDIO_BSIZE to set the msec for audio buffering in Ultimedia library
  */

src/libout123/modules/alib.c

@@ -44,7 +44,7 @@
 #include <Alib.h>   /* /opt/audio/include */
 #include <CUlib.h>  /* /opt/audio/include */
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /**************************************************************************/
 

src/libout123/modules/alsa.c

@@ -27,7 +27,7 @@
 #include <alloca.h> /* GCC complains about missing declaration of alloca. */
 #include <alsa/asoundlib.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* Total buffer size in seconds, 0.2 is more true to what ALSA maximally uses
    here (8192 samples). The earlier default of 0.5 was never true. */

src/libout123/modules/arts.c

@@ -10,7 +10,7 @@
 
 #include "../out123_int.h"
 #include <artsc.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct
 {

src/libout123/modules/coreaudio.c

@@ -46,7 +46,7 @@
 #define SFIFO_STATIC
 #include "../sfifo.c"
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* Duration of the ring buffer in seconds.
    Is that all that there is to tunable latency?

src/libout123/modules/dummy.c

@@ -6,7 +6,7 @@
 */
 
 #include "../out123_int.h"
-#include "debug.h"
+#include "../../common/debug.h"
 
 static int open_dummy(out123_handle *ao)
 {

src/libout123/modules/esd.c

@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/audioio.h>
 #endif
-#include "debug.h"
+#include "../../common/debug.h"
 
 static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0;
 

src/libout123/modules/hp.c

@@ -9,7 +9,7 @@
 #include "../out123_int.h"
 #include <fcntl.h>
 #include <sys/audio.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 
 static int set_rate(out123_handle *ao)

src/libout123/modules/jack.c

@@ -26,7 +26,7 @@
 #include <semaphore.h>
 #include <sys/errno.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct {
 	int alive;

src/libout123/modules/mint.c

@@ -12,7 +12,7 @@
 #include <fcntl.h>
 #include <ioctl.h>
 #include <audios.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 /* Globals */
 /* extern int outburst; */

src/libout123/modules/nas.c

@@ -10,7 +10,7 @@
 #include <fcntl.h>
 #include <audio/audiolib.h>
 #include <audio/soundlib.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct
 {

src/libout123/modules/openal.c

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 #define NUM_BUFFERS 16
 

src/libout123/modules/os2.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 // Only one instance at a time! This all needs to go into userptr!
 static BOOL opened = FALSE;

src/libout123/modules/oss.c

@@ -39,7 +39,7 @@
 # endif
 #endif
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 struct oss_stuff
 {

src/libout123/modules/portaudio.c

@@ -21,7 +21,7 @@
 #define SFIFO_STATIC
 #include "../sfifo.c"
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 #define SAMPLE_SIZE			(2)
 #define FRAMES_PER_BUFFER	(256)

src/libout123/modules/pulse.c

@@ -19,7 +19,7 @@
 #include <pulse/error.h>
 #include <pulse/pulseaudio.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 // Since we learned the async API for enumeration, let's abuse it for
 // a simple check if a pulse server is active before accidentally

src/libout123/modules/qsa.c

@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <sys/asoundlib.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 typedef struct _qsa_mp_map
 {

src/libout123/modules/sdl.c

@@ -23,7 +23,7 @@
 #define SFIFO_STATIC
 #include "../sfifo.c"
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 
 #define SAMPLE_SIZE			(2)

src/libout123/modules/sgi.c

@@ -9,8 +9,8 @@
 #include "../out123_int.h"
 #include <fcntl.h>
 #include <dmedia/audio.h>
-#include "errno.h"
+#include <errno.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 static int set_rate(out123_handle *ao, ALconfig config)
 {

src/libout123/modules/sndio.c

@@ -21,7 +21,7 @@
 
 #include <sndio.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 static int sndio_to_mpg123_enc(int sign, int bits)
 {

src/libout123/modules/sun.c

@@ -29,7 +29,7 @@
 #endif
 
 #include <fcntl.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 static void set_format_helper(out123_handle *ao, audio_info_t *ainfo)
 {

src/libout123/modules/tinyalsa.c

@@ -12,7 +12,7 @@
 
 #include <tinyalsa/asoundlib.h>
 
-#include "debug.h"
+#include "../../common/debug.h"
 
 
 typedef struct

src/libout123/modules/win32.c

@@ -11,7 +11,7 @@
 
 #include "../out123_int.h"
 #include <windows.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 /*
     Buffer size and number of buffers in the playback ring

src/libout123/modules/win32_wasapi.c

@@ -21,7 +21,7 @@
 #include <mmdeviceapi.h>
 #include <avrt.h>
 #include <functiondiscoverykeys_devpkey.h>
-#include "debug.h"
+#include "../../common/debug.h"
 
 #ifdef _MSC_VER
 

src/libout123/out123_int.h

@@ -12,8 +12,8 @@
 #define MPG123_ENUM_API
 
 #include "config.h"
-#include "abi_align.h"
+#include "../common/abi_align.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include "out123.h"
 #include "module.h"
 

src/libout123/sfifo.c

@@ -19,7 +19,7 @@ TODO:
 #include	<stdlib.h>
 
 #include "sfifo.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 /*
  * Alloc buffer, init FIFO etc...

src/libout123/stringlists.c

@@ -10,7 +10,7 @@
 	functions just for returning driver module lists.
 */
 
-#include "compat.h"
+#include "../compat/compat.h"
 #include "out123.h"
 
 static char* always_strdup(const char *in)

src/libout123/wav.c

@@ -28,7 +28,7 @@
 #include "wav.h"
 
 #include <errno.h>
-#include "debug.h"
+#include "../common/debug.h"
 
 /* Create the two WAV headers. */
 

src/libout123/xfermem.c

@@ -10,7 +10,7 @@
 */
 
 #include "config.h"
-#include "compat.h"
+#include "../compat/compat.h"
 #include "xfermem.h"
 #include <string.h>
 #include <errno.h>
@@ -24,7 +24,7 @@
 #include <sys/shm.h>
 #endif
 
-#include "debug.h"
+#include "../common/debug.h"
 
 #if defined (HAVE_MMAP) && defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
 #define MAP_ANON MAP_ANONYMOUS

src/libout123/xfermem.h

@@ -20,7 +20,7 @@
 #ifndef _XFERMEM_H_
 #define _XFERMEM_H_
 
-#include "compat.h"
+#include "../compat/compat.h"
 
 typedef struct {
 	size_t freeindex;	/* [W] next free index */

src/libsyn123/libsyn123.c

@@ -20,9 +20,9 @@
 */
 
 #include "syn123_int.h"
-#include "version.h"
+#include "../version.h"
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 const char * attribute_align_arg syn123_distversion(unsigned int *major, unsigned int *minor, unsigned int *patch)
 {

src/libsyn123/resample.c

@@ -82,7 +82,7 @@ TODO: initialize with first sample or zero? is there an actual benefit? impulse
 // SSIZE_MAX is not standard C:-/
 #define _POSIX_C_SOURCE 200809L
 #include "syn123_int.h"
-#include "debug.h"
+#include "../common/debug.h"
 
 // coefficient tables generated from coeff-ellip-6-0.01-36-16.txd
 // (coeff-{filter_type}-{order}-{passband_ripple}-{rejection_dB}-{points})

src/libsyn123/sampleconv.c

@@ -19,8 +19,8 @@
 #define NO_SMAX
 #define RAND_XORSHIFT32
 #include "syn123_int.h"
-#include "sample.h"
+#include "../common/sample.h"
-#include "debug.h"
+#include "../common/debug.h"
 // Avoid conflict with pragmas in isnan() and friends.
 #undef warning
 
@@ -988,7 +988,7 @@ mix_end:
 
 /* All the byte-swappery for those little big endian boxes. */
 
-#include "swap_bytes_impl.h"
+#include "../common/swap_bytes_impl.h"
 
 void attribute_align_arg
 syn123_swap_bytes(void* buf, size_t samplesize, size_t samplecount)

src/libsyn123/syn123_int.h

@@ -17,8 +17,8 @@
 #ifdef LFS_LARGEFILE_64
 #define _LARGEFILE64_SOURCE
 #endif
-#include "abi_align.h"
+#include "../common/abi_align.h"
-#include "compat.h"
+#include "../compat/compat.h"
 
 #define SYN123_NO_LARGEFUNC
 #include "syn123.h"

src/libsyn123/volume.c

@@ -11,7 +11,7 @@
 #define NO_GROW_BUF
 #define NO_SMAX
 #include "syn123_int.h"
-#include "debug.h"
+#include "../common/debug.h"
 // Avoid conflict with pragmas in isnan() and friends.
 #undef warning
 

src/local.c

@@ -22,7 +22,7 @@
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
-#include "compat.h"
+#include "compat/compat.h"
 
 #include "local.h"
 
@@ -39,7 +39,7 @@
 #include <wincon.h>
 #endif
 
-#include "debug.h"
+#include "common/debug.h"
 
 int utf8force = 0; // enforce UTF-8 workings
 int utf8env = 0; // produce UTF-8 text output

src/metaprint.c

@@ -19,7 +19,7 @@
 
 #include "metaprint.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 int meta_show_lyrics = 0;
 

src/mpg123-id3dump.c

@@ -11,7 +11,7 @@
 #define _BSD_SOURCE
 #include "config.h"
 #include "version.h"
-#include "compat.h"
+#include "compat/compat.h"
 #if defined(WIN32) && defined(DYNAMIC_BUILD)
 #define LINK_MPG123_DLL
 #endif
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include "win32_support.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 static int errors = 0;
 

src/mpg123-strip.c

@@ -8,7 +8,7 @@
 
 #include "config.h"
 #include "version.h"
-#include "compat.h"
+#include "compat/compat.h"
 
 #if defined(WIN32) && defined(DYNAMIC_BUILD)
 #define LINK_MPG123_DLL

src/mpg123.c

@@ -44,7 +44,7 @@
 #include "httpget.h"
 #include "streamdump.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 static void usage(int err);
 static void want_usage(char* arg, topt *);

src/mpg123app.h

@@ -22,7 +22,7 @@
 #endif
 
 /* everyone needs it */
-#include "compat.h"
+#include "compat/compat.h"
 /* import DLL symbols on windows */
 
 #include "httpget.h"

src/net123_exec.c

@@ -26,9 +26,9 @@
 // Just for parameter struct that we use for HTTP auth and proxy info.
 #include "mpg123app.h"
 
-#include "compat.h"
+#include "compat/compat.h"
 
-#include "debug.h"
+#include "common/debug.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>

src/net123_winhttp.c

@@ -1,8 +1,8 @@
 #include "config.h"
 #include "version.h"
 #include "net123.h"
-#include "compat.h"
+#include "compat/compat.h"
-#include "debug.h"
+#include "common/debug.h"
 #include <ws2tcpip.h>
 #include <winhttp.h>
 

src/net123_wininet.c

@@ -1,8 +1,8 @@
 #include "config.h"
 #include "version.h"
 #include "net123.h"
-#include "compat.h"
+#include "compat/compat.h"
-#include "debug.h"
+#include "common/debug.h"
 #include <ws2tcpip.h>
 #include <wininet.h>
 

src/out123.c

@@ -29,7 +29,7 @@
 #define ME "out123"
 #include "config.h"
 #include "version.h"
-#include "compat.h"
+#include "compat/compat.h"
 #include <ctype.h>
 #if _WIN32
 #include "win32_support.h"
@@ -62,7 +62,7 @@
 #include "syn123.h"
 #include "filters.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 /* be paranoid about setpriority support */
 #ifndef PRIO_PROCESS

src/playlist.c

@@ -22,7 +22,7 @@
 #include "local.h"
 #include "metaprint.h"
 #include <time.h> /* For srand(). */
-#include "debug.h"
+#include "common/debug.h"
 
 #ifdef HAVE_RANDOM
 #define RAND random

src/resolver.c

@@ -16,7 +16,7 @@
 #include "mpg123app.h"
 
 #ifdef NETWORK
-#include "true.h"
+#include "common/true.h"
 #include "resolver.h"
 #if !defined (WANT_WIN32_SOCKETS)
 #include <netdb.h>
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #endif
 #include <unistd.h>
-#include "debug.h"
+#include "common/debug.h"
 
 int split_url(mpg123_string *url, mpg123_string *auth, mpg123_string *host, mpg123_string *port, mpg123_string *path)
 {

src/streamdump.c

@@ -16,7 +16,7 @@
 #include "streamdump.h"
 #include <fcntl.h>
 #include <errno.h>
-#include "debug.h"
+#include "common/debug.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0

src/sysutil.c

@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include "sysutil.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 #if 0
 /* removed the strndup for better portability */

src/term.c

@@ -14,7 +14,7 @@
 #include "common.h"
 #include "playlist.h"
 #include "metaprint.h"
-#include "debug.h"
+#include "common/debug.h"
 
 static int term_enable = 0;
 static const char *extrabreak = "";