diff --git a/autotools/INSTALL.in b/INSTALL.in
similarity index 100%
rename from autotools/INSTALL.in
rename to INSTALL.in
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..98fbe13
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,52 @@
+#
+# Makefile.am
+#
+# src Makefile.am. Process this file with automake to generate a Makefile
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+#*
+#* This file part of: FreeTure
+#*
+#* Copyright: (C) 2014-2015 Yoan Audureau, Chiara Marmo
+#* FRIPON-GEOPS-UPSUD-CNRS
+#*
+#* License: GNU General Public License
+#*
+#* FreeTure is free software: you can redistribute it and/or modify
+#* it under the terms of the GNU General Public License as published by
+#* the Free Software Foundation, either version 3 of the License, or
+#* (at your option) any later version.
+#* FreeTure is distributed in the hope that it will be useful,
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#* GNU General Public License for more details.
+#* You should have received a copy of the GNU General Public License
+#* along with FreeTure. If not, see .
+#*
+#* Last modified: 20/01/2015
+#*
+#*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+AUTOMAKE_OPTIONS = foreign no-dependencies
+SUBDIRS = doc src
+dist_pkgdata_DATA = share/configuration.cfg
+EXTRA_DIST = README NEWS INSTALL acx_boost.m4 acx_cfitsio.m4 \
+ acx_opencv.m4 acx_pylon.m4 acx_urbi_resolve_dir.m4 \
+ bootstrap.sh THANKS
+#RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir`
+#RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES
+#dist-hook:
+# rm -rf `find $(distdir) -name .svn`
+
+#rpm: dist
+# cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
+# rpmbuild -ba --clean $(PACKAGE_NAME).spec
+
+#rpm-icc: dist
+# cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
+# USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec
+
+#rpm-best: dist
+# cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
+# USE_BEST="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec
+
+
diff --git a/autotools/README.in b/README.in
similarity index 100%
rename from autotools/README.in
rename to README.in
diff --git a/autotools/acx_boost.m4 b/acx_boost.m4
similarity index 100%
rename from autotools/acx_boost.m4
rename to acx_boost.m4
diff --git a/autotools/acx_cfitsio.m4 b/acx_cfitsio.m4
similarity index 100%
rename from autotools/acx_cfitsio.m4
rename to acx_cfitsio.m4
diff --git a/autotools/acx_opencv.m4 b/acx_opencv.m4
similarity index 100%
rename from autotools/acx_opencv.m4
rename to acx_opencv.m4
diff --git a/autotools/acx_pylon.m4 b/acx_pylon.m4
similarity index 100%
rename from autotools/acx_pylon.m4
rename to acx_pylon.m4
diff --git a/autotools/acx_urbi_resolve_dir.m4 b/acx_urbi_resolve_dir.m4
similarity index 100%
rename from autotools/acx_urbi_resolve_dir.m4
rename to acx_urbi_resolve_dir.m4
diff --git a/autotools/Makefile.am b/autotools/Makefile.am
deleted file mode 100644
index 2c943c0..0000000
--- a/autotools/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Makefile.am
-#
-# src Makefile.am. Process this file with automake to generate a Makefile
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#*
-#* This file part of: FreeTure
-#*
-#* Copyright: (C) 2014-2015 Yoan Audureau, Chiara Marmo
-#* FRIPON-GEOPS-UPSUD-CNRS
-#*
-#* License: GNU General Public License
-#*
-#* FreeTure is free software: you can redistribute it and/or modify
-#* it under the terms of the GNU General Public License as published by
-#* the Free Software Foundation, either version 3 of the License, or
-#* (at your option) any later version.
-#* FreeTure is distributed in the hope that it will be useful,
-#* but WITHOUT ANY WARRANTY; without even the implied warranty of
-#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#* GNU General Public License for more details.
-#* You should have received a copy of the GNU General Public License
-#* along with FreeTure. If not, see .
-#*
-#* Last modified: 20/01/2015
-#*
-#*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-AUTOMAKE_OPTIONS = foreign no-dependencies subdir-objects
-bin_PROGRAMS = FreeTure
-SRC_DIR = ../src
-
-FreeTure_SOURCES = $(SRC_DIR)/EImgBitDepth.h $(SRC_DIR)/ECamType.h $(SRC_DIR)/EParser.h $(SRC_DIR)/EParser.cpp \
- $(SRC_DIR)/EDetMeth.h $(SRC_DIR)/Base64.h $(SRC_DIR)/Camera.h $(SRC_DIR)/AcqThread.h $(SRC_DIR)/AcqThread.cpp \
- $(SRC_DIR)/CameraVideo.h $(SRC_DIR)/CameraGigeAravis.h $(SRC_DIR)/CameraGigeAravis.cpp \
- $(SRC_DIR)/CameraFrames.h $(SRC_DIR)/CameraGigePylon.h $(SRC_DIR)/CameraGigePylon.cpp $(SRC_DIR)/CameraV4l2.cpp $(SRC_DIR)/CameraV4l2.h \
- $(SRC_DIR)/SMTPClient.h ../src/CameraGigeTis.h ../src/CameraGigeTis.cpp ../src/Circle.h \
- $(SRC_DIR)/Configuration.h $(SRC_DIR)/Conversion.h $(SRC_DIR)/DetThread.h $(SRC_DIR)/Detection.h \
- $(SRC_DIR)/Fits.h $(SRC_DIR)/Fits2D.h $(SRC_DIR)/Fits3D.h $(SRC_DIR)/Frame.h $(SRC_DIR)/GlobalEvent.h $(SRC_DIR)/Histogram.h $(SRC_DIR)/DetectionTemplate.h \
- $(SRC_DIR)/LocalEvent.h $(SRC_DIR)/EStackMeth.h $(SRC_DIR)/DetectionTemplate.cpp $(SRC_DIR)/DetectionTemporal.h $(SRC_DIR)/DetectionTemporal.cpp \
- $(SRC_DIR)/TimeDate.h $(SRC_DIR)/Device.h $(SRC_DIR)/Device.cpp $(SRC_DIR)/Stack.h $(SRC_DIR)/Stack.cpp $(SRC_DIR)/Ephemeris.cpp \
- $(SRC_DIR)/SaveImg.h $(SRC_DIR)/ECamBitDepth.h $(SRC_DIR)/StackThread.h $(SRC_DIR)/StackThread.cpp \
- $(SRC_DIR)/Base64.cpp $(SRC_DIR)/ESmtpSecurity.h $(SRC_DIR)/OpenSSL.h $(SRC_DIR)/OpenSSL.cpp $(SRC_DIR)/Socket.h \
- $(SRC_DIR)/CameraFrames.cpp $(SRC_DIR)/SMTPClient.cpp $(SRC_DIR)/HistogramGray.h $(SRC_DIR)/HistogramGray.cpp \
- $(SRC_DIR)/CameraVideo.cpp $(SRC_DIR)/Configuration.cpp $(SRC_DIR)/Conversion.cpp $(SRC_DIR)/Ephemeris.h \
- $(SRC_DIR)/DetThread.cpp $(SRC_DIR)/Fits.cpp $(SRC_DIR)/Fits2D.cpp $(SRC_DIR)/Fits3D.cpp $(SRC_DIR)/Logger.h \
- $(SRC_DIR)/Frame.cpp $(SRC_DIR)/GlobalEvent.cpp $(SRC_DIR)/Histogram.cpp $(SRC_DIR)/AcqSchedule.h $(SRC_DIR)/AcqSchedule.cpp \
- $(SRC_DIR)/LocalEvent.cpp $(SRC_DIR)/main.cpp $(SRC_DIR)/HistogramRGB.h $(SRC_DIR)/HistogramRGB.cpp $(SRC_DIR)/EImgFormat.h \
- $(SRC_DIR)/TimeDate.cpp $(SRC_DIR)/ExposureControl.cpp $(SRC_DIR)/ExposureControl.h $(SRC_DIR)/ETimeMode.h \
- $(SRC_DIR)/SaveImg.cpp $(SRC_DIR)/ELogSeverityLevel.h $(SRC_DIR)/ImgProcessing.cpp $(SRC_DIR)/ImgProcessing.h
-
-dist_pkgdata_DATA = ../share/configuration.cfg
-EXTRA_DIST = README NEWS INSTALL acx_boost.m4 acx_cfitsio.m4 \
- acx_opencv.m4 acx_pylon.m4 acx_urbi_resolve_dir.m4 \
- bootstrap.sh THANKS
-
-
diff --git a/autotools/bootstrap.sh b/bootstrap.sh
similarity index 100%
rename from autotools/bootstrap.sh
rename to bootstrap.sh
diff --git a/autotools/configure.ac b/configure.ac
similarity index 98%
rename from autotools/configure.ac
rename to configure.ac
index ff27f5b..8a4785b 100644
--- a/autotools/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ define([AC_CACHE_SAVE],)
AC_PREREQ([2.69])
AC_INIT([freeture], [0.8-3], [yoan.audureau@u-psud.fr])
-AC_CONFIG_SRCDIR([../src/main.cpp])
+AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
@@ -231,7 +231,10 @@ AC_MSG_RESULT([Link cmdline: $CC $AM_LDFLAGS $LDFLAGS $LIBS])
AC_MSG_RESULT([***************************************************************])
AC_CONFIG_FILES([Makefile
- README
- INSTALL
+ README
+ INSTALL
+ doc/Makefile
+ doc/freeture.1
+ src/Makefile
])
AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..7e36774
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,28 @@
+#
+# Makefile.am
+#
+# src Makefile.am. Process this file with automake to generate a Makefile
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+#*
+#* This file part of: freeture
+#*
+#* Copyright: (C) 2014 Yoan Audureau -- FRIPON-GEOPS-UPSUD
+#*
+#* License: GNU General Public License
+#*
+#* FreeTure is free software: you can redistribute it and/or modify
+#* it under the terms of the GNU General Public License as published by
+#* the Free Software Foundation, either version 3 of the License, or
+#* (at your option) any later version.
+#* FreeTure is distributed in the hope that it will be useful,
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#* GNU General Public License for more details.
+#* You should have received a copy of the GNU General Public License
+#* along with FreeTure. If not, see .
+#*
+#* Last modified: 23/05/2014
+#*
+#*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+dist_man_MANS = freeture.1 freeture.x
diff --git a/doc/freeture.1.in b/doc/freeture.1.in
new file mode 100644
index 0000000..ce3b7b2
--- /dev/null
+++ b/doc/freeture.1.in
@@ -0,0 +1,47 @@
+.TH FREETURE "1" "@DATE3@" "FREETURE @PACKAGE_VERSION@" "User Commands"
+.SH NAME
+freeture \- performs image acquisition and meteor detection .SH SYNOPSIS
+.B scamp
+\fIcatalog1\fR [\fIcatalog2 ...\fR][\fI@catalog_list1\fR [\fI@catalog_list2 ...\fR]]
+.RS
+[\fI-c configuration-file\fR][\fI-param1 value1 -param2 value2 ...\fR]
+.RE
+.TP
+.B scamp \fI-d\fR
+.SH DESCRIPTION
+freeture is a software that performs image acquisition and meteor detection
+.RE
+See http://fripon.github.io/freeture for more details.
+.SS "Operation modes:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+print this help, then exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+print version number, then exit
+.TP
+\fB\-d\fR, \fB\-\-dump\fR
+dump a default configuration file
+.TP
+\fB\-dd\fR, \fB\-\-ddump\fR
+dump an extended default configuration file
+.SH MANUAL
+The full documentation for
+.B SCAMP
+is maintained as a PDF manual available at
+.B http://fripon.github.io/freeture
+.SH "REPORTING BUGS"
+Please report bugs to ...
+.SH "SEE ALSO"
+.BR
+.SH AUTHORS
+Written by Yoan Audureau (Geosciences Paris Sud)
+.PP
+.SH LICENSE
+freeture is licensed under the terms of the General Public License (GPL),
+version 3.
+.SH COPYRIGHT
+.PP
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
diff --git a/doc/freeture.x b/doc/freeture.x
new file mode 100644
index 0000000..367a45c
--- /dev/null
+++ b/doc/freeture.x
@@ -0,0 +1,2 @@
+[name]
+freeture \- performs image acquisition and meteor detection
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..15906e6
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,50 @@
+#
+# Makefile.am
+#
+# src Makefile.am. Process this file with automake to generate a Makefile
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+#*
+#* This file part of: freeture
+#*
+#* Copyright: (C) 2014-2015 Yoan Audureau, Chiara Marmo
+#* FRIPON-GEOPS-UPSUD-CNRS
+#*
+#* License: GNU General Public License
+#*
+#* FreeTure is free software: you can redistribute it and/or modify
+#* it under the terms of the GNU General Public License as published by
+#* the Free Software Foundation, either version 3 of the License, or
+#* (at your option) any later version.
+#* FreeTure is distributed in the hope that it will be useful,
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#* GNU General Public License for more details.
+#* You should have received a copy of the GNU General Public License
+#* along with FreeTure. If not, see .
+#*
+#* Last modified: 20/10/2014
+#*
+#*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
+bin_PROGRAMS = freeture
+freeture_SOURCES = EImgBitDepth.h ECamType.h EParser.h EParser.cpp \
+ EDetMeth.h Base64.h Camera.h AcqThread.h AcqThread.cpp \
+ CameraVideo.h CameraGigeAravis.h CameraGigeAravis.cpp \
+ CameraFrames.h CameraGigePylon.h CameraGigePylon.cpp CameraV4l2.cpp CameraV4l2.h \
+ SMTPClient.h CameraGigeTis.h CameraGigeTis.cpp Circle.h \
+ Configuration.h Conversion.h DetThread.h Detection.h \
+ Fits.h Fits2D.h Fits3D.h Frame.h GlobalEvent.h Histogram.h DetectionTemplate.h \
+ LocalEvent.h EStackMeth.h DetectionTemplate.cpp DetectionTemporal.h DetectionTemporal.cpp \
+ TimeDate.h Device.h Device.cpp Stack.h Stack.cpp Ephemeris.cpp \
+ SaveImg.h ECamBitDepth.h StackThread.h StackThread.cpp \
+ Base64.cpp ESmtpSecurity.h OpenSSL.h OpenSSL.cpp Socket.h \
+ CameraFrames.cpp SMTPClient.cpp HistogramGray.h HistogramGray.cpp \
+ CameraVideo.cpp Configuration.cpp Conversion.cpp Ephemeris.h \
+ DetThread.cpp Fits.cpp Fits2D.cpp Fits3D.cpp Logger.h \
+ Frame.cpp GlobalEvent.cpp Histogram.cpp AcqSchedule.h AcqSchedule.cpp \
+ LocalEvent.cpp main.cpp HistogramRGB.h HistogramRGB.cpp EImgFormat.h \
+ TimeDate.cpp ExposureControl.cpp ExposureControl.h ETimeMode.h \
+ SaveImg.cpp ELogSeverityLevel.h ImgProcessing.cpp ImgProcessing.h
+
+DATE=`date +"%Y-%m-%d"`
+