API: moving into a more traditional structure, doxigen config file up…

…date
timosmd · Jul 7, 2017 · 76702c4 · 76702c4
1 parent d41c574
commit 76702c4
Show file tree

Hide file tree

Showing 35 changed files with 10 additions and 35 deletions.
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ $(INSTALL_DIR):
 # API libraries
 ################################################################################
 
-LIBRP_DIR       = api/rpbase
+LIBRP_DIR       = api
 LIBRP2_DIR      = api2
 LIBRPLCR_DIR	= Applications/api/rpApplications/lcr_meter
 LIBRPAPP_DIR    = Applications/api/rpApplications

diff --git a/Test/calibrate/calibrateApp2.c b/Test/calibrate/calibrateApp2.c
@@ -1,11 +1,10 @@
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
 
 #include "redpitaya/rp.h"
-#include "../../api/rpbase/src/common.h"
+#include "../../api/src/common.h"
 
 
 void waitForUser ( void )

diff --git a/api/rpbase/doc/conf/doxyfile.inc → api/Doxyfile b/api/rpbase/doc/conf/doxyfile.inc → api/Doxyfile
@@ -7,8 +7,7 @@ DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "Base Library"
 PROJECT_NUMBER         = 1.0
 PROJECT_BRIEF          = 
-PROJECT_LOGO           = ../doc/img/redpitaya-logo.png
-OUTPUT_DIRECTORY       = ../doc/doxygen
+OUTPUT_DIRECTORY       = doxygen
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -107,7 +106,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = rp.h
+INPUT                  = include/redpitaya/rp.h
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \
                          *.cc \

diff --git a/api/rpbase/Makefile → api/Makefile b/api/rpbase/Makefile → api/Makefile
@@ -9,7 +9,7 @@
 # REVISION ?= devbuild
 # VER:=$(shell cat info/info.json | grep version | sed -e 's/.*:\ *\"//' | sed -e 's/-.*//')
 
-LIBRP=../lib/librp.so
+LIBRP=lib/librp.so
 
 all: $(LIBRP)
 

diff --git a/api/rpbase/doc/Makefile b/api/rpbase/doc/Makefile
diff --git a/api/rpbase/doc/img/redpitaya-logo.png b/api/rpbase/doc/img/redpitaya-logo.png
diff --git a/api/rpbase/src/Makefile → api/src/Makefile b/api/rpbase/src/Makefile → api/src/Makefile
@@ -26,7 +26,7 @@ OBJEXT   = .o
 OBJECTS_DIR = ../obj
 INSTALL_DIR ?= .
 SOURCE_DIR  = .
-OUTPUT_DIR  = ../../lib
+OUTPUT_DIR  = ../lib
 
 SHARED_LIB=$(OUTPUT_DIR)/librp.so
 STATIC_LIB=$(OUTPUT_DIR)/librp.a
@@ -52,7 +52,7 @@ OBJS = $(patsubst %$(OBJEXT), $(OBJECTS_DIR)/%$(OBJEXT), $(OBJECTS))
 # GCC compiling & linking flags
 CFLAGS  = -std=gnu99 -Wall -Werror -fPIC -Ikiss_fft -Os -s
 CFLAGS += -DVERSION=$(VERSION) -DREVISION=$(REVISION)
-CFLAGS += -I../../include
+CFLAGS += -I../include
 LDFLAGS=-shared -Wl,--version-script=exportmap
 
 # Additional libraries which needs to be dynamically linked to the executable
@@ -96,4 +96,4 @@ install:
 	mkdir -p $(INSTALL_DIR)/lib
 	mkdir -p $(INSTALL_DIR)/include
 	cp  $(TARGET) $(INSTALL_DIR)/lib
-	cp -r ../../include/redpitaya $(INSTALL_DIR)/include
+	cp -r ../include/redpitaya $(INSTALL_DIR)/include
diff --git a/api/rpbase/src/acq_handler.c → api/src/acq_handler.c b/api/rpbase/src/acq_handler.c → api/src/acq_handler.c
diff --git a/api/rpbase/src/acq_handler.h → api/src/acq_handler.h b/api/rpbase/src/acq_handler.h → api/src/acq_handler.h
diff --git a/api/rpbase/src/analog_mixed_signals.h → api/src/analog_mixed_signals.h b/api/rpbase/src/analog_mixed_signals.h → api/src/analog_mixed_signals.h
diff --git a/api/rpbase/src/calib.c → api/src/calib.c b/api/rpbase/src/calib.c → api/src/calib.c
diff --git a/api/rpbase/src/calib.h → api/src/calib.h b/api/rpbase/src/calib.h → api/src/calib.h
diff --git a/api/rpbase/src/common.c → api/src/common.c b/api/rpbase/src/common.c → api/src/common.c
diff --git a/api/rpbase/src/common.h → api/src/common.h b/api/rpbase/src/common.h → api/src/common.h
diff --git a/api/rpbase/src/exportmap → api/src/exportmap b/api/rpbase/src/exportmap → api/src/exportmap
diff --git a/api/rpbase/src/gen_handler.c → api/src/gen_handler.c b/api/rpbase/src/gen_handler.c → api/src/gen_handler.c
diff --git a/api/rpbase/src/gen_handler.h → api/src/gen_handler.h b/api/rpbase/src/gen_handler.h → api/src/gen_handler.h
diff --git a/api/rpbase/src/generate.c → api/src/generate.c b/api/rpbase/src/generate.c → api/src/generate.c
diff --git a/api/rpbase/src/generate.h → api/src/generate.h b/api/rpbase/src/generate.h → api/src/generate.h
diff --git a/api/rpbase/src/housekeeping.h → api/src/housekeeping.h b/api/rpbase/src/housekeeping.h → api/src/housekeeping.h
diff --git a/api/rpbase/src/kiss_fft/Makefile → api/src/kiss_fft/Makefile b/api/rpbase/src/kiss_fft/Makefile → api/src/kiss_fft/Makefile
diff --git a/api/rpbase/src/kiss_fft/_kiss_fft_guts.h → api/src/kiss_fft/_kiss_fft_guts.h b/api/rpbase/src/kiss_fft/_kiss_fft_guts.h → api/src/kiss_fft/_kiss_fft_guts.h
diff --git a/api/rpbase/src/kiss_fft/kiss_fft.c → api/src/kiss_fft/kiss_fft.c b/api/rpbase/src/kiss_fft/kiss_fft.c → api/src/kiss_fft/kiss_fft.c
diff --git a/api/rpbase/src/kiss_fft/kiss_fft.h → api/src/kiss_fft/kiss_fft.h b/api/rpbase/src/kiss_fft/kiss_fft.h → api/src/kiss_fft/kiss_fft.h
diff --git a/api/rpbase/src/kiss_fft/kiss_fftr.c → api/src/kiss_fft/kiss_fftr.c b/api/rpbase/src/kiss_fft/kiss_fftr.c → api/src/kiss_fft/kiss_fftr.c
diff --git a/api/rpbase/src/kiss_fft/kiss_fftr.h → api/src/kiss_fft/kiss_fftr.h b/api/rpbase/src/kiss_fft/kiss_fftr.h → api/src/kiss_fft/kiss_fftr.h
diff --git a/api/rpbase/src/oscilloscope.c → api/src/oscilloscope.c b/api/rpbase/src/oscilloscope.c → api/src/oscilloscope.c
diff --git a/api/rpbase/src/oscilloscope.h → api/src/oscilloscope.h b/api/rpbase/src/oscilloscope.h → api/src/oscilloscope.h
diff --git a/api/rpbase/src/rp.c → api/src/rp.c b/api/rpbase/src/rp.c → api/src/rp.c
diff --git a/api/rpbase/src/spec_dsp.c → api/src/spec_dsp.c b/api/rpbase/src/spec_dsp.c → api/src/spec_dsp.c
diff --git a/api/rpbase/src/spec_dsp.h → api/src/spec_dsp.h b/api/rpbase/src/spec_dsp.h → api/src/spec_dsp.h
diff --git a/api/rpbase/src/spec_fpga.c → api/src/spec_fpga.c b/api/rpbase/src/spec_fpga.c → api/src/spec_fpga.c
diff --git a/api/rpbase/src/spec_fpga.h → api/src/spec_fpga.h b/api/rpbase/src/spec_fpga.h → api/src/spec_fpga.h
diff --git a/scpi-server/src/apin.c b/scpi-server/src/apin.c
@@ -18,7 +18,7 @@
 #include "common.h"
 #include "apin.h"
 #include "scpi/parser.h"
-#include "../../api/rpbase/src/common.h"
+#include "../../api/src/common.h"
 
 /* Apin choice def */
 const scpi_choice_def_t scpi_RpApin[] = {

diff --git a/scpi-server/src/generate.c b/scpi-server/src/generate.c
@@ -18,7 +18,7 @@
 #include <math.h>
 
 #include "generate.h"
-#include "../../api/rpbase/src/generate.h"
+#include "../../api/src/generate.h"
 
 #include "common.h"
 #include "scpi/parser.h"