reconstruct directory structure

sean0921 · Mar 8, 2020 · a37012b · a37012b
1 parent 4693f0c
commit a37012b
Show file tree

Hide file tree

Showing 32 changed files with 94 additions and 194 deletions.
diff --git a/00_bern2time/Makefile.am b/00_bern2time/Makefile.am
diff --git a/01_raw/Makefile.am b/01_raw/Makefile.am
diff --git a/02_remove_trend/Makefile.am b/02_remove_trend/Makefile.am
diff --git a/03_remove_period/Makefile.am b/03_remove_period/Makefile.am
diff --git a/04_remove_antenna/Makefile.am b/04_remove_antenna/Makefile.am
diff --git a/05_Fit_velocity/Makefile.am b/05_Fit_velocity/Makefile.am
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,6 @@
 #### Simple Makefile for build a pack
 
-SUBDIRS = 00_bern2time 01_raw 02_remove_trend 03_remove_period 04_remove_antenna 05_Fit_velocity util
+SUBDIRS = src
 
 MAINdir=build/
 MAIN_DATA=COPYRIGHT.md README.md

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([timeseries_process], [2019.1005.0], [https://github.com/sean0921/timeseries_process])
+AC_INIT([timeseries_process], [2020.308.0], [https://github.com/sean0921/timeseries_process])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 #AC_CONFIG_SRCDIR([])
 #AC_CONFIG_HEADERS([config.h])
@@ -53,13 +53,7 @@ esac
 
 # Checks for library functions.
 
-AC_CONFIG_FILES([00_bern2time/Makefile
-                 01_raw/Makefile
-                 02_remove_trend/Makefile
-                 03_remove_period/Makefile
-                 04_remove_antenna/Makefile
-                 05_Fit_velocity/Makefile
-                 util/Makefile
+AC_CONFIG_FILES([src/Makefile
                  common/version.rc
                  Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -0,0 +1,85 @@
+#Makefile
+
+TARGETdir=../build
+TARGET_PROGRAMS=bern2time getpl comfilt raw comfilt_trend remove_trend remove_period remove_antenna fit plot_ts
+TARGET_DATA=comfilt.inp.example  raw.inp.example plot_ts.inp.example order.txt
+
+bern2time_SOURCES=bern2time.for ../common/bubblesort.for
+getpl_SOURCES=getpl.for ../common/bubblesort.for
+comfilt_SOURCES=comfilt.for ../common/bubblesort.for ../common/int2char.for ../common/lsqr.for
+raw_SOURCES=comfilt.for ../common/bubblesort.for ../common/int2char.for ../common/lsqr.for
+raw_FCFLAGS=-DRAW
+raw_FFLAGS=-DRAW
+comfilt_trend_SOURCES=comfilt_trend.for ../common/bubblesort.for ../common/int2char.for ../common/lsqr.for
+remove_trend_SOURCES=remove_trend.for
+remove_period_SOURCES=remove_period.for
+remove_antenna_SOURCES=remove_antenna.for
+fit_SOURCES=fit.for ../common/int2char.for ../common/lsqr.for
+plot_ts_SOURCES=plot_ts.for
+
+if IS_WINDOWS
+
+bern2time_DEPENDENCIES=bern2time.rc.o
+getpl_DEPENDENCIES=getpl.rc.o
+comfilt_DEPENDENCIES=comfilt.rc.o
+raw_DEPENDENCIES=raw.rc.o
+comfilt_trend_DEPENDENCIES=comfilt_trend.rc.o
+remove_trend_DEPENDENCIES=remove_trend.rc.o
+remove_period_DEPENDENCIES=remove_period.rc.o
+remove_antenna_DEPENDENCIES=remove_antenna.rc.o
+fit_DEPENDENCIES=fit.rc.o
+plot_ts_DEPENDENCIES=plot_ts.rc.o
+bern2time_LDFLAGS=bern2time.rc.o
+getpl_LDFLAGS=getpl.rc.o
+comfilt_LDFLAGS=comfilt.rc.o
+raw_LDFLAGS=raw.rc.o
+comfilt_trend_LDFLAGS=comfilt_trend.rc.o
+remove_trend_LDFLAGS=remove_trend.rc.o
+remove_period_LDFLAGS=remove_period.rc.o
+remove_antenna_LDFLAGS=remove_antenna.rc.o
+fit_LDFLAGS=fit.rc.o
+plot_ts_LDFLAGS=plot_ts.rc.o
+SUFFIXES = .rc .o
+RCFILES=bern2time.rc comfilt.rc comfilt_trend.rc fit.rc getpl.rc plot_ts.rc raw.rc remove_antenna.rc remove_period.rc remove_trend.rc
+
+$(RCFILES): %.rc:
+	printf "id ICON \"$$(basename $@ .rc).ico\"" > $@
+	cat ../common/version.rc >> $@
+
+bern2time.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+getpl.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+comfilt.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+raw.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+comfilt_trend.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+remove_trend.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+remove_period.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+remove_antenna.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+fit.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+plot_ts.rc.o: %.rc.o: %.rc
+	$(WINDRES) $< -O coff -o $@
+
+ico: %.rc
+	convert -density 384 ../icons/sketchy_plot.svg -define icon:auto-resize $$(basename $< .rc).ico
+
+clean-local:
+	rm -f *.rc
+
+endif
diff --git a/00_bern2time/bern2time.for → src/bern2time.for b/00_bern2time/bern2time.for → src/bern2time.for
diff --git a/00_bern2time/bern2time.ico → src/bern2time.ico b/00_bern2time/bern2time.ico → src/bern2time.ico
diff --git a/01_raw/comfilt.for → src/comfilt.for b/01_raw/comfilt.for → src/comfilt.for
diff --git a/01_raw/comfilt.ico → src/comfilt.ico b/01_raw/comfilt.ico → src/comfilt.ico
diff --git a/01_raw/comfilt.inp.example → src/comfilt.inp.example b/01_raw/comfilt.inp.example → src/comfilt.inp.example
diff --git a/01_raw/comfilt_trend.for → src/comfilt_trend.for b/01_raw/comfilt_trend.for → src/comfilt_trend.for
diff --git a/01_raw/comfilt_trend.ico → src/comfilt_trend.ico b/01_raw/comfilt_trend.ico → src/comfilt_trend.ico
diff --git a/05_Fit_velocity/fit.for → src/fit.for b/05_Fit_velocity/fit.for → src/fit.for
diff --git a/05_Fit_velocity/fit.ico → src/fit.ico b/05_Fit_velocity/fit.ico → src/fit.ico
diff --git a/00_bern2time/getpl.for → src/getpl.for b/00_bern2time/getpl.for → src/getpl.for
diff --git a/00_bern2time/getpl.ico → src/getpl.ico b/00_bern2time/getpl.ico → src/getpl.ico
diff --git a/src/order.txt b/src/order.txt
@@ -0,0 +1,6 @@
+00_bern2time
+01_raw
+02_remove_trend
+03_remove_period
+04_remove_antenna
+05_Fit_velocity
diff --git a/util/plot_ts.for → src/plot_ts.for b/util/plot_ts.for → src/plot_ts.for
diff --git a/util/plot_ts.ico → src/plot_ts.ico b/util/plot_ts.ico → src/plot_ts.ico
diff --git a/util/plot_ts.inp.example → src/plot_ts.inp.example b/util/plot_ts.inp.example → src/plot_ts.inp.example
diff --git a/01_raw/raw.ico → src/raw.ico b/01_raw/raw.ico → src/raw.ico
diff --git a/01_raw/raw.inp.example → src/raw.inp.example b/01_raw/raw.inp.example → src/raw.inp.example
diff --git a/04_remove_antenna/remove_antenna.for → src/remove_antenna.for b/04_remove_antenna/remove_antenna.for → src/remove_antenna.for
diff --git a/04_remove_antenna/remove_antenna.ico → src/remove_antenna.ico b/04_remove_antenna/remove_antenna.ico → src/remove_antenna.ico
diff --git a/03_remove_period/remove_period.for → src/remove_period.for b/03_remove_period/remove_period.for → src/remove_period.for
diff --git a/03_remove_period/remove_period.ico → src/remove_period.ico b/03_remove_period/remove_period.ico → src/remove_period.ico
diff --git a/02_remove_trend/remove_trend.for → src/remove_trend.for b/02_remove_trend/remove_trend.for → src/remove_trend.for
diff --git a/02_remove_trend/remove_trend.ico → src/remove_trend.ico b/02_remove_trend/remove_trend.ico → src/remove_trend.ico