Split files into directories

samueltardieu · Nov 12, 2016 · cfe2a27 · cfe2a27
1 parent dd20853
commit cfe2a27
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 13 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,19 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
-
-bin_PROGRAMS = recoverjpeg recovermov
-dist_bin_SCRIPTS = sort-pictures remove-duplicates
-
-dist_man_MANS = recoverjpeg.1 recovermov.1 sort-pictures.1 remove-duplicates.1
+SUBDIRS = src doc scripts
 
 extra_DIST = ChangeLog
 
 always::
 
 ChangeLog: always
 	git2cl > ChangeLog
-
-recoverjpeg_SOURCES = recoverjpeg.c utils.c utils.h
-recovermov_SOURCES = recovermov.cpp utils.c utils.h
-
-.md.1:
-	pandoc -s -w man $< -o $@
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 AC_INIT([recoverjpeg], [2.6])
-AC_CONFIG_SRCDIR([recoverjpeg.c])
+AC_CONFIG_SRCDIR([src/recoverjpeg.c])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER([config.h])
 AC_PROG_CC
 AC_PROG_CXX
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile doc/Makefile])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -0,0 +1,4 @@
+dist_man_MANS = recoverjpeg.1 recovermov.1 sort-pictures.1 remove-duplicates.1
+
+.md.1:
+	pandoc -s -w man $< -o $@
diff --git a/README.md → doc/README.md b/README.md → doc/README.md
diff --git a/recoverjpeg.md → doc/recoverjpeg.md b/recoverjpeg.md → doc/recoverjpeg.md
diff --git a/recovermov.md → doc/recovermov.md b/recovermov.md → doc/recovermov.md
diff --git a/remove-duplicates.md → doc/remove-duplicates.md b/remove-duplicates.md → doc/remove-duplicates.md
diff --git a/sort-pictures.md → doc/sort-pictures.md b/sort-pictures.md → doc/sort-pictures.md
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -0,0 +1 @@
+dist_bin_SCRIPTS = sort-pictures remove-duplicates
diff --git a/remove-duplicates → scripts/remove-duplicates b/remove-duplicates → scripts/remove-duplicates
diff --git a/sort-pictures → scripts/sort-pictures b/sort-pictures → scripts/sort-pictures
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -0,0 +1,4 @@
+bin_PROGRAMS = recoverjpeg recovermov
+
+recoverjpeg_SOURCES = recoverjpeg.c utils.c utils.h
+recovermov_SOURCES = recovermov.cpp utils.c utils.h
diff --git a/recoverjpeg.c → src/recoverjpeg.c b/recoverjpeg.c → src/recoverjpeg.c
diff --git a/recovermov.cpp → src/recovermov.cpp b/recovermov.cpp → src/recovermov.cpp
diff --git a/utils.c → src/utils.c b/utils.c → src/utils.c
diff --git a/utils.h → src/utils.h b/utils.h → src/utils.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		dist_bin_SCRIPTS = sort-pictures remove-duplicates