rename files in preparation of submodule

configure.ac

@@ -83,13 +83,13 @@ AS_IF([test "x$with_alsa" == "xyes"],[AC_MSG_NOTICE( Compiling with Alsa support
 AM_CONDITIONAL(HAVE_SDR, false )
 
 AC_OUTPUT(
-	src/liboptions/Makefile
-	src/libdebug/Makefile
-	src/libsample/Makefile
-	src/libfilter/Makefile
-	src/libwave/Makefile
-	src/libdisplay/Makefile
-	src/libsound/Makefile
+	src/lib/liboptions/Makefile
+	src/lib/libdebug/Makefile
+	src/lib/libsample/Makefile
+	src/lib/libfilter/Makefile
+	src/lib/libwave/Makefile
+	src/lib/libdisplay/Makefile
+	src/lib/libsound/Makefile
 	src/uk0/Makefile
 	src/Makefile
 	Makefile)

src/Makefile.am

@@ -1,16 +1,16 @@
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = \
-	liboptions \
-	libdebug \
-	libsample \
-	libfilter \
-	libwave \
-	libdisplay
+	lib/liboptions \
+	lib/libdebug \
+	lib/libsample \
+	lib/libfilter \
+	lib/libwave \
+	lib/libdisplay
 
 if HAVE_ALSA
 SUBDIRS += \
-	libsound
+	lib/libsound
 endif
 
 SUBDIRS += \

src/uk0/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib
 
 bin_PROGRAMS = \
 	uk0-soundcard
@@ -11,16 +11,16 @@ uk0_soundcard_SOURCES = \
 
 uk0_soundcard_LDADD = \
 	$(COMMON_LA) \
-	../libdebug/libdebug.a \
-	../liboptions/liboptions.a \
-	../libsample/libsample.a \
-	../libfilter/libfilter.a \
-	../libdisplay/libdisplay.a \
-	../libwave/libwave.a
+	../lib/libdebug/libdebug.a \
+	../lib/liboptions/liboptions.a \
+	../lib/libsample/libsample.a \
+	../lib/libfilter/libfilter.a \
+	../lib/libdisplay/libdisplay.a \
+	../lib/libwave/libwave.a
 
 if HAVE_ALSA
 uk0_soundcard_LDADD += \
-	../libsound/libsound.a \
+	../lib/libsound/libsound.a \
 	$(ALSA_LIBS)
 endif
 

src/uk0/hdlc.c

@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #include "uk0.h"
 
 //#define DEBUG_HDLC

src/uk0/main.c

@@ -26,10 +26,10 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <time.h>
-#include "../libdebug/debug.h"
-#include "../liboptions/options.h"
-#include "../libsample/sample.h"
-#include "../libsound/sound.h"
+#include <libdebug/debug.h>
+#include <liboptions/options.h>
+#include <libsample/sample.h>
+#include <libsound/sound.h>
 #include "uk0.h"
 
 uk0_t *uk0[2] = { NULL, NULL };

src/uk0/ph_socket.c

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <time.h>
-#include "../libdebug/debug.h"
+#include <libdebug/debug.h>
 #include "ph_socket.h"
 
 #define CHAN s->name

src/uk0/uk0.c

@@ -24,8 +24,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <math.h>
-#include "../libdebug/debug.h"
-#include "../libsample/sample.h"
+#include <libdebug/debug.h>
+#include <libsample/sample.h>
 #include "uk0.h"
 
 #define CHAN uk0->name

src/uk0/uk0.h

@@ -1,8 +1,8 @@
 
-#include "../libsample/sample.h"
-#include "../libfilter/iir_filter.h"
-#include "../libwave/wave.h"
-#include "../libdisplay/display.h"
+#include <libsample/sample.h>
+#include <libfilter/iir_filter.h>
+#include <libwave/wave.h>
+#include <libdisplay/display.h>
 #include "hdlc.h"
 #include "ph_socket.h"