Move source code under a src/ subdir

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>

diff --git a/Makefile.am b/Makefile.am
index c24f9b2ee7dc9e15de5838375e88c8d584030053..6319ac03f8faa4d0b0c5025e6482bd6a02b527a5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,42 +4,5 @@
 #
 # Licensed under LGPL 2.1. See file COPYING.
 
-include $(top_srcdir)/common.mk
-
-SUBDIRS = 7z
-
-AM_CFLAGS = \
-       $(ERROR_CFLAGS) \
-       $(ZLIB_CFLAGS) \
-       $(LIBXML2_CFLAGS)
-
-bin_PROGRAMS = rcomage
-
-rcomage_SOURCES = \
-               configscan.c \
-               configscan.h \
-               general.c \
-               general.h \
-               globdefs.c \
-               main.c \
-               rcodump.c \
-               rcodump.h \
-               rcomain.c \
-               rcomain.h \
-               rcoreader.c \
-               rcowriter.c \
-               rcofile.h \
-               rlzpack.c \
-               vaghandler.c \
-               vaghandler.h \
-               xmlread.c \
-               xmlwrite.c \
-               xml.h \
-               vsmx.c \
-               vsmx.h \
-               rlzpack.h \
-               strfuncs.h
-
-
-rcomage_LDADD = $(top_builddir)/7z/lib7z.la \
-       $(ZLIB_LIBS) $(LIBXML2_LIBS) -lstdc++
+SUBDIRS = 7z \
+          src

diff --git a/configure.ac b/configure.ac
index d7ae0979397ff6319b0081394d5ade8cdf738288..01643a1dfc7cf19369c7c4feb2055b3e4ca46dda 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.66])
 AC_INIT([RCOMage], [1.1.1])
-AC_CONFIG_SRCDIR([rcomain.c])
+AC_CONFIG_SRCDIR([src/rcomain.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -52,5 +52,6 @@ AC_CHECK_FUNCS([floor memchr memmove memset sqrt strcasecmp strchr strrchr strto
 
 AM_INIT_AUTOMAKE([-Wall])
 AC_CONFIG_FILES([7z/Makefile
-                Makefile])
+                Makefile
+                src/Makefile])
 AC_OUTPUT

diff --git a/kakaroto-indent b/kakaroto-indent
index 74feb29b28b04f0e5f93f3fbe332c40e219d6881..300b85aa4f620f864e3aebadc3b2366f658f4a24 100755 (executable)
--- a/kakaroto-indent
+++ b/kakaroto-indent
@@ -55,8 +55,8 @@ BREAK_LONG_LINES=" \
 
 
 # Fix indentation
-indent $BLANKS $COMMENTS $STATEMENTS $DECLARATIONS $INDENTATION $BREAK_LONG_LINES *.[ch]
+indent $BLANKS $COMMENTS $STATEMENTS $DECLARATIONS $INDENTATION $BREAK_LONG_LINES src/*.[ch]
 
 # Remove all trailing whitespaces
-sed 's/[ \t]*$//' -i *.[ch]
+sed 's/[ \t]*$//' -i src/*.[ch]
 

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644 (file)
index 0000000..7d11de6
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,44 @@
+# Makefile.am for RCOMage
+#
+# (C) Youness Alaoui (KaKaRoTo)
+#
+# Licensed under LGPL 2.1. See file COPYING.
+#
+
+include $(top_srcdir)/common.mk
+
+AM_CFLAGS = \
+       $(ERROR_CFLAGS) \
+       $(ZLIB_CFLAGS) \
+       $(LIBXML2_CFLAGS)
+
+bin_PROGRAMS = rcomage
+
+rcomage_SOURCES = \
+               configscan.c \
+               configscan.h \
+               general.c \
+               general.h \
+               globdefs.c \
+               main.c \
+               rcodump.c \
+               rcodump.h \
+               rcomain.c \
+               rcomain.h \
+               rcoreader.c \
+               rcowriter.c \
+               rcofile.h \
+               rlzpack.c \
+               vaghandler.c \
+               vaghandler.h \
+               xmlread.c \
+               xmlwrite.c \
+               xml.h \
+               vsmx.c \
+               vsmx.h \
+               rlzpack.h \
+               strfuncs.h
+
+
+rcomage_LDADD = $(top_builddir)/7z/lib7z.la \
+       $(ZLIB_LIBS) $(LIBXML2_LIBS) -lstdc++

diff --git a/configscan.c b/src/configscan.c
similarity index 100%
rename from configscan.c
rename to src/configscan.c

diff --git a/configscan.h b/src/configscan.h
similarity index 100%
rename from configscan.h
rename to src/configscan.h

diff --git a/general.c b/src/general.c
similarity index 100%
rename from general.c
rename to src/general.c

diff --git a/general.h b/src/general.h
similarity index 100%
rename from general.h
rename to src/general.h

diff --git a/globdefs.c b/src/globdefs.c
similarity index 100%
rename from globdefs.c
rename to src/globdefs.c

diff --git a/main.c b/src/main.c
similarity index 100%
rename from main.c
rename to src/main.c

diff --git a/rcodump.c b/src/rcodump.c
similarity index 100%
rename from rcodump.c
rename to src/rcodump.c

diff --git a/rcodump.h b/src/rcodump.h
similarity index 100%
rename from rcodump.h
rename to src/rcodump.h

diff --git a/rcofile.h b/src/rcofile.h
similarity index 100%
rename from rcofile.h
rename to src/rcofile.h

diff --git a/rcomain.c b/src/rcomain.c
similarity index 100%
rename from rcomain.c
rename to src/rcomain.c

diff --git a/rcomain.h b/src/rcomain.h
similarity index 100%
rename from rcomain.h
rename to src/rcomain.h

diff --git a/rcoreader.c b/src/rcoreader.c
similarity index 100%
rename from rcoreader.c
rename to src/rcoreader.c

diff --git a/rcowriter.c b/src/rcowriter.c
similarity index 100%
rename from rcowriter.c
rename to src/rcowriter.c

diff --git a/rlzpack.c b/src/rlzpack.c
similarity index 100%
rename from rlzpack.c
rename to src/rlzpack.c

diff --git a/rlzpack.h b/src/rlzpack.h
similarity index 100%
rename from rlzpack.h
rename to src/rlzpack.h

diff --git a/strfuncs.h b/src/strfuncs.h
similarity index 100%
rename from strfuncs.h
rename to src/strfuncs.h

diff --git a/vaghandler.c b/src/vaghandler.c
similarity index 100%
rename from vaghandler.c
rename to src/vaghandler.c

diff --git a/vaghandler.h b/src/vaghandler.h
similarity index 100%
rename from vaghandler.h
rename to src/vaghandler.h

diff --git a/vsmx.c b/src/vsmx.c
similarity index 100%
rename from vsmx.c
rename to src/vsmx.c

diff --git a/vsmx.h b/src/vsmx.h
similarity index 100%
rename from vsmx.h
rename to src/vsmx.h

diff --git a/xml.h b/src/xml.h
similarity index 100%
rename from xml.h
rename to src/xml.h

diff --git a/xmlread.c b/src/xmlread.c
similarity index 100%
rename from xmlread.c
rename to src/xmlread.c

diff --git a/xmlwrite.c b/src/xmlwrite.c
similarity index 100%
rename from xmlwrite.c
rename to src/xmlwrite.c