Moved source to src directoryHEADmaster

48 files changed, 64 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index d347f98..2a85a59 100644
--- a/Makefile
+++ b/Makefile
@@ -7,20 +7,21 @@ CLEAN=
 
 BUILD_DIR=build/
 
-SOURCES= 
+SRC_DIR=src/
+SOURCES=
 OBJECTS= 
 OBJECTS_FINAL=
 
-include core/make.mk
-include draw/make.mk
-include filt/make.mk
-include hw/make.mk
-include mod/make.mk
+include $(SRC_DIR)/core/make.mk
+include $(SRC_DIR)/draw/make.mk
+include $(SRC_DIR)/filt/make.mk
+include $(SRC_DIR)/hw/make.mk
+include $(SRC_DIR)/mod/make.mk
 
 
 
 make: $(OBJECTS) 
-	$(CC) $(OBJECTS_FINAL) $(PROJECT).c -o $(PROJECT) $(LDFLAGS)
+	$(CC) $(OBJECTS_FINAL) $(SRC_DIR)$(PROJECT).c -o $(PROJECT) $(LDFLAGS)
 	ld -r $(OBJECTS_FINAL) -o $(PROJECT).o
 
 %.o: %.c
diff --git a/core/make.mk b/core/make.mk
deleted file mode 100644
index a1fe655..0000000
--- a/core/make.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-DIR_CORE = core/
-SOURCES_CORE += core/math.c
-OBJECTS_CORE += $(SOURCES_CORE:.c=.o)
-LDFLAGS += -lm
-LDFLAGS_BSD += -lm
-
-
-OBJECTS_DIR_CORE += $(subst $(DIR_CORE),$(BUILD_DIR)$(DIR_CORE),$(OBJECTS_CORE))
-
-OBJECTS += $(OBJECTS_CORE)
-OBJECTS_FINAL += $(OBJECTS_DIR_CORE)
\ No newline at end of file
diff --git a/draw/make.mk b/draw/make.mk
deleted file mode 100644
index a626ca6..0000000
--- a/draw/make.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-DIR_DRAW = draw/
-SOURCES_DRAW += draw/glui.c draw/tui.c draw/ui.c
-OBJECTS_DRAW += $(SOURCES_DRAW:.c=.o)
-LDFLAGS += -lGL `sdl2-config --cflags --libs`
-LDFLAGS_BSD +=
-
-
-OBJECTS_DIR_DRAW += $(subst $(DIR_DRAW),$(BUILD_DIR)$(DIR_DRAW),$(OBJECTS_DRAW))
-
-OBJECTS += $(OBJECTS_DRAW)
-OBJECTS_FINAL += $(OBJECTS_DIR_DRAW)
\ No newline at end of file
diff --git a/filt/make.mk b/filt/make.mk
deleted file mode 100644
index be7468f..0000000
--- a/filt/make.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-DIR_FILT = filt/
-SOURCES_FILT += filt/filt_5th.c filt/filt_delay.c
-OBJECTS_FILT += $(SOURCES_FILT:.c=.o)
-LDFLAGS += 
-LDFLAGS_BSD +=
-
-
-OBJECTS_DIR_FILT += $(subst $(DIR_FILT),$(BUILD_DIR)$(DIR_FILT),$(OBJECTS_FILT))
-
-OBJECTS += $(OBJECTS_FILT)
-OBJECTS_FINAL += $(OBJECTS_DIR_FILT)
\ No newline at end of file
diff --git a/hw/make.mk b/hw/make.mk
deleted file mode 100644
index 102341d..0000000
--- a/hw/make.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-DIR_HW = hw/
-SOURCES_HW += hw/aud.c hw/hw.c hw/hw_eeprom.c hw/sdr.c
-OBJECTS_HW += $(SOURCES_HW:.c=.o)
-LDFLAGS += -lrtlsdr -lasound
-LDFLAGS_BSD += -lrtlsdr
-
-
-OBJECTS_DIR_HW += $(subst $(DIR_HW),$(BUILD_DIR)$(DIR_HW),$(OBJECTS_HW))
-
-OBJECTS += $(OBJECTS_HW)
-OBJECTS_FINAL += $(OBJECTS_DIR_HW)
\ No newline at end of file
diff --git a/mod/make.mk b/mod/make.mk
deleted file mode 100644
index e6b13f9..0000000
--- a/mod/make.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-DIR_MOD = mod/
-SOURCES_MOD += mod/mod_fm.c
-OBJECTS_MOD += $(SOURCES_MOD:.c=.o)
-LDFLAGS += 
-LDFLAGS_BSD +=
-
-
-OBJECTS_DIR_MOD += $(subst $(DIR_MOD),$(BUILD_DIR)$(DIR_MOD),$(OBJECTS_MOD))
-
-OBJECTS += $(OBJECTS_MOD)
-OBJECTS_FINAL += $(OBJECTS_DIR_MOD)
\ No newline at end of file
diff --git a/Kconfig b/src/Kconfig
index 2af8bdc..2af8bdc 100644
--- a/Kconfig
+++ b/src/Kconfig
diff --git a/codec/Kconfig b/src/codec/Kconfig
index e69de29..e69de29 100644
--- a/codec/Kconfig
+++ b/src/codec/Kconfig
diff --git a/config.h b/src/config.h
index 92f562b..92f562b 100644
--- a/config.h
+++ b/src/config.h
diff --git a/config/config_bsd.h b/src/config/config_bsd.h
index f74e647..f74e647 100644
--- a/config/config_bsd.h
+++ b/src/config/config_bsd.h
diff --git a/config/config_linux.h b/src/config/config_linux.h
index 51c4a13..51c4a13 100644
--- a/config/config_linux.h
+++ b/src/config/config_linux.h
diff --git a/core/Kconfig b/src/core/Kconfig
index 28befc6..28befc6 100644
--- a/core/Kconfig
+++ b/src/core/Kconfig
diff --git a/src/core/make.mk b/src/core/make.mk
new file mode 100644
index 0000000..52f08ec
--- /dev/null
+++ b/src/core/make.mk
@@ -0,0 +1,11 @@
+DIR_CORE = core/
+SOURCES_CORE += $(SRC_DIR)core/math.c
+OBJECTS_CORE += $(SOURCES_CORE:.c=.o)
+LDFLAGS += -lm
+LDFLAGS_BSD += -lm
+
+
+OBJECTS_DIR_CORE += $(subst $(SRC_DIR)$(DIR_CORE),$(BUILD_DIR)$(SRC_DIR)$(DIR_CORE),$(OBJECTS_CORE))
+
+OBJECTS += $(OBJECTS_CORE)
+OBJECTS_FINAL += $(OBJECTS_DIR_CORE)
\ No newline at end of file
diff --git a/core/math.c b/src/core/math.c
index f962534..f962534 100644
--- a/core/math.c
+++ b/src/core/math.c
diff --git a/core/math.h b/src/core/math.h
index dff1ffa..dff1ffa 100644
--- a/core/math.h
+++ b/src/core/math.h
diff --git a/draw/Kconfig b/src/draw/Kconfig
index 486461f..486461f 100644
--- a/draw/Kconfig
+++ b/src/draw/Kconfig
diff --git a/draw/glui.c b/src/draw/glui.c
index 0f1e360..0f1e360 100644
--- a/draw/glui.c
+++ b/src/draw/glui.c
diff --git a/draw/glui.h b/src/draw/glui.h
index 9206bdf..9206bdf 100644
--- a/draw/glui.h
+++ b/src/draw/glui.h
diff --git a/src/draw/make.mk b/src/draw/make.mk
new file mode 100644
index 0000000..5c0acc4
--- /dev/null
+++ b/src/draw/make.mk
@@ -0,0 +1,11 @@
+DIR_DRAW = draw/
+SOURCES_DRAW += $(SRC_DIR)draw/glui.c $(SRC_DIR)draw/tui.c $(SRC_DIR)draw/ui.c
+OBJECTS_DRAW += $(SOURCES_DRAW:.c=.o)
+LDFLAGS += -lGL `sdl2-config --cflags --libs`
+LDFLAGS_BSD +=
+
+
+OBJECTS_DIR_DRAW += $(subst $(SRC_DIR)$(DIR_DRAW),$(BUILD_DIR)$(SRC_DIR)$(DIR_DRAW),$(OBJECTS_DRAW))
+
+OBJECTS += $(OBJECTS_DRAW)
+OBJECTS_FINAL += $(OBJECTS_DIR_DRAW)
\ No newline at end of file
diff --git a/draw/tui.c b/src/draw/tui.c
index c431a61..c431a61 100644
--- a/draw/tui.c
+++ b/src/draw/tui.c
diff --git a/draw/tui.h b/src/draw/tui.h
index a84379f..a84379f 100644
--- a/draw/tui.h
+++ b/src/draw/tui.h
diff --git a/draw/ui.c b/src/draw/ui.c
index e69de29..e69de29 100644
--- a/draw/ui.c
+++ b/src/draw/ui.c
diff --git a/draw/ui.h b/src/draw/ui.h
index e69de29..e69de29 100644
--- a/draw/ui.h
+++ b/src/draw/ui.h
diff --git a/fft/Kconfig b/src/fft/Kconfig
index e69de29..e69de29 100644
--- a/fft/Kconfig
+++ b/src/fft/Kconfig
diff --git a/filt/Kconfig b/src/filt/Kconfig
index e69de29..e69de29 100644
--- a/filt/Kconfig
+++ b/src/filt/Kconfig
diff --git a/filt/filt.h b/src/filt/filt.h
index 9ce2caa..9ce2caa 100644
--- a/filt/filt.h
+++ b/src/filt/filt.h
diff --git a/filt/filt_5th.c b/src/filt/filt_5th.c
index 23d5aab..23d5aab 100644
--- a/filt/filt_5th.c
+++ b/src/filt/filt_5th.c
diff --git a/filt/filt_delay.c b/src/filt/filt_delay.c
index 53da0b0..53da0b0 100644
--- a/filt/filt_delay.c
+++ b/src/filt/filt_delay.c
diff --git a/src/filt/make.mk b/src/filt/make.mk
new file mode 100644
index 0000000..51aa82a
--- /dev/null
+++ b/src/filt/make.mk
@@ -0,0 +1,11 @@
+DIR_FILT = filt/
+SOURCES_FILT += $(SRC_DIR)filt/filt_5th.c $(SRC_DIR)filt/filt_delay.c
+OBJECTS_FILT += $(SOURCES_FILT:.c=.o)
+LDFLAGS += 
+LDFLAGS_BSD +=
+
+
+OBJECTS_DIR_FILT += $(subst $(SRC_DIR)$(DIR_FILT),$(BUILD_DIR)$(SRC_DIR)$(DIR_FILT),$(OBJECTS_FILT))
+
+OBJECTS += $(OBJECTS_FILT)
+OBJECTS_FINAL += $(OBJECTS_DIR_FILT)
\ No newline at end of file
diff --git a/hw/Kconfig b/src/hw/Kconfig
index f95a0f5..f95a0f5 100644
--- a/hw/Kconfig
+++ b/src/hw/Kconfig
diff --git a/hw/aud.c b/src/hw/aud.c
index ade60cb..ade60cb 100644
--- a/hw/aud.c
+++ b/src/hw/aud.c
diff --git a/hw/aud.h b/src/hw/aud.h
index 974646a..974646a 100644
--- a/hw/aud.h
+++ b/src/hw/aud.h
diff --git a/hw/hw.c b/src/hw/hw.c
index 4496a51..4496a51 100644
--- a/hw/hw.c
+++ b/src/hw/hw.c
diff --git a/hw/hw.h b/src/hw/hw.h
index ac79431..ac79431 100644
--- a/hw/hw.h
+++ b/src/hw/hw.h
diff --git a/hw/hw_eeprom.c b/src/hw/hw_eeprom.c
index 10ae817..10ae817 100644
--- a/hw/hw_eeprom.c
+++ b/src/hw/hw_eeprom.c
diff --git a/hw/hw_eeprom.h b/src/hw/hw_eeprom.h
index ac3ec0a..ac3ec0a 100644
--- a/hw/hw_eeprom.h
+++ b/src/hw/hw_eeprom.h
diff --git a/src/hw/make.mk b/src/hw/make.mk
new file mode 100644
index 0000000..34d3e6f
--- /dev/null
+++ b/src/hw/make.mk
@@ -0,0 +1,12 @@
+DIR_HW = hw/
+SOURCES_HW += $(SRC_DIR)hw/aud.c $(SRC_DIR)hw/hw.c $(SRC_DIR)hw/hw_eeprom.c \
+$(SRC_DIR)hw/sdr.c
+OBJECTS_HW += $(SOURCES_HW:.c=.o)
+LDFLAGS += -lrtlsdr -lasound
+LDFLAGS_BSD += -lrtlsdr
+
+
+OBJECTS_DIR_HW += $(subst $(SRC_DIR)$(DIR_HW),$(BUILD_DIR)$(SRC_DIR)$(DIR_HW),$(OBJECTS_HW))
+
+OBJECTS += $(OBJECTS_HW)
+OBJECTS_FINAL += $(OBJECTS_DIR_HW)
\ No newline at end of file
diff --git a/hw/sdr.c b/src/hw/sdr.c
index a9590da..a9590da 100644
--- a/hw/sdr.c
+++ b/src/hw/sdr.c
diff --git a/hw/sdr.h b/src/hw/sdr.h
index ce4ef70..ce4ef70 100644
--- a/hw/sdr.h
+++ b/src/hw/sdr.h
diff --git a/mod/Kconfig b/src/mod/Kconfig
index 50413a0..50413a0 100644
--- a/mod/Kconfig
+++ b/src/mod/Kconfig
diff --git a/src/mod/make.mk b/src/mod/make.mk
new file mode 100644
index 0000000..b00ec90
--- /dev/null
+++ b/src/mod/make.mk
@@ -0,0 +1,11 @@
+DIR_MOD = mod/
+SOURCES_MOD += $(SRC_DIR)mod/mod_fm.c
+OBJECTS_MOD += $(SOURCES_MOD:.c=.o)
+LDFLAGS += 
+LDFLAGS_BSD +=
+
+
+OBJECTS_DIR_MOD += $(subst $(SRC_DIR)$(DIR_MOD),$(BUILD_DIR)$(SRC_DIR)$(DIR_MOD),$(OBJECTS_MOD))
+
+OBJECTS += $(OBJECTS_MOD)
+OBJECTS_FINAL += $(OBJECTS_DIR_MOD)
\ No newline at end of file
diff --git a/mod/mod.h b/src/mod/mod.h
index 288d40b..288d40b 100644
--- a/mod/mod.h
+++ b/src/mod/mod.h
diff --git a/mod/mod_fm.c b/src/mod/mod_fm.c
index 22b296b..22b296b 100644
--- a/mod/mod_fm.c
+++ b/src/mod/mod_fm.c
diff --git a/net/Kconfig b/src/net/Kconfig
index e69de29..e69de29 100644
--- a/net/Kconfig
+++ b/src/net/Kconfig
diff --git a/plug/Kconfig b/src/plug/Kconfig
index e69de29..e69de29 100644
--- a/plug/Kconfig
+++ b/src/plug/Kconfig
diff --git a/radiola.c b/src/radiola.c
index aaaf047..aaaf047 100644
--- a/radiola.c
+++ b/src/radiola.c
diff --git a/utils/Kconfig b/src/utils/Kconfig
index e69de29..e69de29 100644
--- a/utils/Kconfig
+++ b/src/utils/Kconfig
diff --git a/version.h b/src/version.h
index e69de29..e69de29 100644
--- a/version.h
+++ b/src/version.h