* Makefile.am, external/Makefile.am: Here.
---
ChangeLog | 6 ++++++
Makefile.am | 7 +------
external/Makefile.am | 3 ---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c35f101..51e3c84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-03 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Clean up a bit Olena's Makefiles.
+
+ * Makefile.am, external/Makefile.am: Here.
+
2010-06-02 Roland Levillain <roland(a)lrde.epita.fr>
* lrde-upload.sh: Fix and factor uses of chmod.
diff --git a/Makefile.am b/Makefile.am
index c591b00..347913f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-## Process this file through Automake to produce Makefile.in.
-
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = build-aux external milena
@@ -125,11 +123,10 @@ dist-hook:
)
-# Set the package version to olena-x.x-snapshot-dd-mm-yy
+# Set the package version to olena-x.x-snapshot-dd-mm-yy.
#
# Do not check NEWS file (this is not a release so there is no
# entries in this file for this package).
-#
snapshot:
current_date=`date +'%d-%m-%y'` \
&& sed -e "s/^\(AC_INIT(\[Olena\],\)
\[\([\.[:alnum:]]*\)\(-snapshot-.*-[[:alnum:]]*\)*\], \(.*\)/\1
[\2-snapshot-$$current_date], \4/g" \
@@ -139,6 +136,4 @@ snapshot:
&& cp -f $(srcdir)/configure.ac.tmp $(srcdir)/configure.ac \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac
-
#>>
-# && $(srcdir)/build-aux/lrde-upload.sh
\ No newline at end of file
diff --git a/external/Makefile.am b/external/Makefile.am
index 0eeb192..fba95ee 100644
--- a/external/Makefile.am
+++ b/external/Makefile.am
@@ -13,9 +13,6 @@
#
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-#
-
-## Process this file through Automake to produce Makefile.in.
SUBDIRS =
--
1.5.6.5