From edae9ee4905da83f11daf3179b3c48de41f5c978 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 1 May 2022 16:19:22 +0200 Subject: [PATCH] rename files in preparation of submodule --- configure.ac | 14 +++++++------- src/Makefile.am | 14 +++++++------- src/{ => lib}/libdebug/Makefile.am | 0 src/{ => lib}/libdebug/debug.c | 0 src/{ => lib}/libdebug/debug.h | 0 src/{ => lib}/libdisplay/Makefile.am | 0 src/{ => lib}/libdisplay/display.h | 0 src/{ => lib}/libdisplay/display_iq.c | 0 src/{ => lib}/libdisplay/display_measurements.c | 0 src/{ => lib}/libdisplay/display_spectrum.c | 0 src/{ => lib}/libdisplay/display_status.c | 0 src/{ => lib}/libdisplay/display_wave.c | 0 src/{ => lib}/libfilter/Makefile.am | 0 src/{ => lib}/libfilter/fir_filter.c | 0 src/{ => lib}/libfilter/fir_filter.h | 0 src/{ => lib}/libfilter/iir_filter.c | 0 src/{ => lib}/libfilter/iir_filter.h | 0 src/{ => lib}/liboptions/Makefile.am | 0 src/{ => lib}/liboptions/options.c | 0 src/{ => lib}/liboptions/options.h | 0 src/{ => lib}/libsample/Makefile.am | 0 src/{ => lib}/libsample/sample.c | 0 src/{ => lib}/libsample/sample.h | 0 src/{ => lib}/libsound/Makefile.am | 0 src/{ => lib}/libsound/sound.h | 0 src/{ => lib}/libsound/sound_alsa.c | 0 src/{ => lib}/libwave/Makefile.am | 0 src/{ => lib}/libwave/wave.c | 0 src/{ => lib}/libwave/wave.h | 0 src/uk0/Makefile.am | 16 ++++++++-------- src/uk0/hdlc.c | 2 +- src/uk0/main.c | 8 ++++---- src/uk0/ph_socket.c | 2 +- src/uk0/uk0.c | 4 ++-- src/uk0/uk0.h | 8 ++++---- 35 files changed, 34 insertions(+), 34 deletions(-) rename src/{ => lib}/libdebug/Makefile.am (100%) rename src/{ => lib}/libdebug/debug.c (100%) rename src/{ => lib}/libdebug/debug.h (100%) rename src/{ => lib}/libdisplay/Makefile.am (100%) rename src/{ => lib}/libdisplay/display.h (100%) rename src/{ => lib}/libdisplay/display_iq.c (100%) rename src/{ => lib}/libdisplay/display_measurements.c (100%) rename src/{ => lib}/libdisplay/display_spectrum.c (100%) rename src/{ => lib}/libdisplay/display_status.c (100%) rename src/{ => lib}/libdisplay/display_wave.c (100%) rename src/{ => lib}/libfilter/Makefile.am (100%) rename src/{ => lib}/libfilter/fir_filter.c (100%) rename src/{ => lib}/libfilter/fir_filter.h (100%) rename src/{ => lib}/libfilter/iir_filter.c (100%) rename src/{ => lib}/libfilter/iir_filter.h (100%) rename src/{ => lib}/liboptions/Makefile.am (100%) rename src/{ => lib}/liboptions/options.c (100%) rename src/{ => lib}/liboptions/options.h (100%) rename src/{ => lib}/libsample/Makefile.am (100%) rename src/{ => lib}/libsample/sample.c (100%) rename src/{ => lib}/libsample/sample.h (100%) rename src/{ => lib}/libsound/Makefile.am (100%) rename src/{ => lib}/libsound/sound.h (100%) rename src/{ => lib}/libsound/sound_alsa.c (100%) rename src/{ => lib}/libwave/Makefile.am (100%) rename src/{ => lib}/libwave/wave.c (100%) rename src/{ => lib}/libwave/wave.h (100%) diff --git a/configure.ac b/configure.ac index 90d266e..901322f 100644 --- a/configure.ac +++ b/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) diff --git a/src/Makefile.am b/src/Makefile.am index 497c1a0..fd1e3d1 100644 --- a/src/Makefile.am +++ b/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 += \ diff --git a/src/libdebug/Makefile.am b/src/lib/libdebug/Makefile.am similarity index 100% rename from src/libdebug/Makefile.am rename to src/lib/libdebug/Makefile.am diff --git a/src/libdebug/debug.c b/src/lib/libdebug/debug.c similarity index 100% rename from src/libdebug/debug.c rename to src/lib/libdebug/debug.c diff --git a/src/libdebug/debug.h b/src/lib/libdebug/debug.h similarity index 100% rename from src/libdebug/debug.h rename to src/lib/libdebug/debug.h diff --git a/src/libdisplay/Makefile.am b/src/lib/libdisplay/Makefile.am similarity index 100% rename from src/libdisplay/Makefile.am rename to src/lib/libdisplay/Makefile.am diff --git a/src/libdisplay/display.h b/src/lib/libdisplay/display.h similarity index 100% rename from src/libdisplay/display.h rename to src/lib/libdisplay/display.h diff --git a/src/libdisplay/display_iq.c b/src/lib/libdisplay/display_iq.c similarity index 100% rename from src/libdisplay/display_iq.c rename to src/lib/libdisplay/display_iq.c diff --git a/src/libdisplay/display_measurements.c b/src/lib/libdisplay/display_measurements.c similarity index 100% rename from src/libdisplay/display_measurements.c rename to src/lib/libdisplay/display_measurements.c diff --git a/src/libdisplay/display_spectrum.c b/src/lib/libdisplay/display_spectrum.c similarity index 100% rename from src/libdisplay/display_spectrum.c rename to src/lib/libdisplay/display_spectrum.c diff --git a/src/libdisplay/display_status.c b/src/lib/libdisplay/display_status.c similarity index 100% rename from src/libdisplay/display_status.c rename to src/lib/libdisplay/display_status.c diff --git a/src/libdisplay/display_wave.c b/src/lib/libdisplay/display_wave.c similarity index 100% rename from src/libdisplay/display_wave.c rename to src/lib/libdisplay/display_wave.c diff --git a/src/libfilter/Makefile.am b/src/lib/libfilter/Makefile.am similarity index 100% rename from src/libfilter/Makefile.am rename to src/lib/libfilter/Makefile.am diff --git a/src/libfilter/fir_filter.c b/src/lib/libfilter/fir_filter.c similarity index 100% rename from src/libfilter/fir_filter.c rename to src/lib/libfilter/fir_filter.c diff --git a/src/libfilter/fir_filter.h b/src/lib/libfilter/fir_filter.h similarity index 100% rename from src/libfilter/fir_filter.h rename to src/lib/libfilter/fir_filter.h diff --git a/src/libfilter/iir_filter.c b/src/lib/libfilter/iir_filter.c similarity index 100% rename from src/libfilter/iir_filter.c rename to src/lib/libfilter/iir_filter.c diff --git a/src/libfilter/iir_filter.h b/src/lib/libfilter/iir_filter.h similarity index 100% rename from src/libfilter/iir_filter.h rename to src/lib/libfilter/iir_filter.h diff --git a/src/liboptions/Makefile.am b/src/lib/liboptions/Makefile.am similarity index 100% rename from src/liboptions/Makefile.am rename to src/lib/liboptions/Makefile.am diff --git a/src/liboptions/options.c b/src/lib/liboptions/options.c similarity index 100% rename from src/liboptions/options.c rename to src/lib/liboptions/options.c diff --git a/src/liboptions/options.h b/src/lib/liboptions/options.h similarity index 100% rename from src/liboptions/options.h rename to src/lib/liboptions/options.h diff --git a/src/libsample/Makefile.am b/src/lib/libsample/Makefile.am similarity index 100% rename from src/libsample/Makefile.am rename to src/lib/libsample/Makefile.am diff --git a/src/libsample/sample.c b/src/lib/libsample/sample.c similarity index 100% rename from src/libsample/sample.c rename to src/lib/libsample/sample.c diff --git a/src/libsample/sample.h b/src/lib/libsample/sample.h similarity index 100% rename from src/libsample/sample.h rename to src/lib/libsample/sample.h diff --git a/src/libsound/Makefile.am b/src/lib/libsound/Makefile.am similarity index 100% rename from src/libsound/Makefile.am rename to src/lib/libsound/Makefile.am diff --git a/src/libsound/sound.h b/src/lib/libsound/sound.h similarity index 100% rename from src/libsound/sound.h rename to src/lib/libsound/sound.h diff --git a/src/libsound/sound_alsa.c b/src/lib/libsound/sound_alsa.c similarity index 100% rename from src/libsound/sound_alsa.c rename to src/lib/libsound/sound_alsa.c diff --git a/src/libwave/Makefile.am b/src/lib/libwave/Makefile.am similarity index 100% rename from src/libwave/Makefile.am rename to src/lib/libwave/Makefile.am diff --git a/src/libwave/wave.c b/src/lib/libwave/wave.c similarity index 100% rename from src/libwave/wave.c rename to src/lib/libwave/wave.c diff --git a/src/libwave/wave.h b/src/lib/libwave/wave.h similarity index 100% rename from src/libwave/wave.h rename to src/lib/libwave/wave.h diff --git a/src/uk0/Makefile.am b/src/uk0/Makefile.am index 0f371ed..76655ec 100644 --- a/src/uk0/Makefile.am +++ b/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 diff --git a/src/uk0/hdlc.c b/src/uk0/hdlc.c index 71e9c68..114eb19 100644 --- a/src/uk0/hdlc.c +++ b/src/uk0/hdlc.c @@ -23,7 +23,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "uk0.h" //#define DEBUG_HDLC diff --git a/src/uk0/main.c b/src/uk0/main.c index fa3b766..34e01c2 100644 --- a/src/uk0/main.c +++ b/src/uk0/main.c @@ -26,10 +26,10 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../liboptions/options.h" -#include "../libsample/sample.h" -#include "../libsound/sound.h" +#include +#include +#include +#include #include "uk0.h" uk0_t *uk0[2] = { NULL, NULL }; diff --git a/src/uk0/ph_socket.c b/src/uk0/ph_socket.c index dacb65f..232fae9 100644 --- a/src/uk0/ph_socket.c +++ b/src/uk0/ph_socket.c @@ -27,7 +27,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "ph_socket.h" #define CHAN s->name diff --git a/src/uk0/uk0.c b/src/uk0/uk0.c index 2389f10..ffb527b 100644 --- a/src/uk0/uk0.c +++ b/src/uk0/uk0.c @@ -24,8 +24,8 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../libsample/sample.h" +#include +#include #include "uk0.h" #define CHAN uk0->name diff --git a/src/uk0/uk0.h b/src/uk0/uk0.h index ac6af3f..a481f51 100644 --- a/src/uk0/uk0.h +++ b/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 +#include +#include +#include #include "hdlc.h" #include "ph_socket.h"