[avida-cvs] avida(kaben) CVS commits: /current Makefile.am /current/doc Makefile.am /current/doc/glossary Makefile.am /current/source Makefile.am /current/source/cpu Makefile.am /current/source/event Makefile.am /current/source/main Makefile.am /current/source/qt-viewer Makefile.am /current/source/qt-viewer/exp/share Makefile.am /current/source/support Makefile.am /current/source/support/preset_organisms Makefile.am /current/source/third-party Makefile.am /current/source/third-party/trio-1.9 Makefile.am /current/source/tools Makefile.am /current/source/viewers Makefile.am
kaben
avida-cvs at alife.org
Thu May 22 22:29:03 PDT 2003
kaben Thu May 22 14:29:03 2003 EDT
Modified files: (Branch: kaben)
/avida/current Makefile.am
/avida/current/doc Makefile.am
/avida/current/doc/glossary Makefile.am
/avida/current/source Makefile.am
/avida/current/source/cpu Makefile.am
/avida/current/source/event Makefile.am
/avida/current/source/main Makefile.am
/avida/current/source/qt-viewer Makefile.am
/avida/current/source/qt-viewer/exp/share Makefile.am
/avida/current/source/support Makefile.am
/avida/current/source/support/preset_organisms Makefile.am
/avida/current/source/third-party Makefile.am
/avida/current/source/third-party/trio-1.9 Makefile.am
/avida/current/source/tools Makefile.am
/avida/current/source/viewers Makefile.am
Log:
Undid earlier cross-directory whitespace changes to Makefile.ams.
This email should contain diffs for each modified file.
Index: avida/current/Makefile.am
diff -u avida/current/Makefile.am:1.7.2.2 avida/current/Makefile.am:1.7.2.3
--- avida/current/Makefile.am:1.7.2.2 Thu May 22 13:44:00 2003
+++ avida/current/Makefile.am Thu May 22 14:28:59 2003
@@ -1,3 +1,4 @@
+
#CXXFLAGS = -Wall
#MAKEFLAGS = -j2 -e CXXFLAGS -e VIEW_LIBS
#VIEW_LIBS = @VIEW_LIBS@
Index: avida/current/doc/Makefile.am
diff -u avida/current/doc/Makefile.am:1.1.2.3 avida/current/doc/Makefile.am:1.1.2.4
--- avida/current/doc/Makefile.am:1.1.2.3 Thu May 22 13:44:01 2003
+++ avida/current/doc/Makefile.am Thu May 22 14:28:59 2003
@@ -1,3 +1,4 @@
+
SUBDIRS = glossary
htmldir = $(HTMLDIR)
Index: avida/current/doc/glossary/Makefile.am
diff -u avida/current/doc/glossary/Makefile.am:1.1.2.3 avida/current/doc/glossary/Makefile.am:1.1.2.4
--- avida/current/doc/glossary/Makefile.am:1.1.2.3 Thu May 22 13:44:01 2003
+++ avida/current/doc/glossary/Makefile.am Thu May 22 14:29:00 2003
@@ -1,3 +1,4 @@
+
glossaryhtmldir = $(HTMLDIR)/glossary
glossaryhtml_DATA = \
components.help \
Index: avida/current/source/Makefile.am
diff -u avida/current/source/Makefile.am:1.21.2.8 avida/current/source/Makefile.am:1.21.2.9
--- avida/current/source/Makefile.am:1.21.2.8 Thu May 22 13:44:01 2003
+++ avida/current/source/Makefile.am Thu May 22 14:29:00 2003
@@ -1,3 +1,5 @@
+
+
SUBDIRS_PRIMITIVE = support
if BUILD_PRIMITIVE
SUBDIRS_PRIMITIVE += third-party tools cpu event main
Index: avida/current/source/cpu/Makefile.am
diff -u avida/current/source/cpu/Makefile.am:1.14.2.5 avida/current/source/cpu/Makefile.am:1.14.2.6
--- avida/current/source/cpu/Makefile.am:1.14.2.5 Thu May 22 13:44:01 2003
+++ avida/current/source/cpu/Makefile.am Thu May 22 14:29:00 2003
@@ -1,3 +1,4 @@
+
libcpu_a_SOURCES = \
cpu_memory.cc cpu_memory.hh \
cpu_stack.cc cpu_stack.hh \
Index: avida/current/source/event/Makefile.am
diff -u avida/current/source/event/Makefile.am:1.12.2.3 avida/current/source/event/Makefile.am:1.12.2.4
--- avida/current/source/event/Makefile.am:1.12.2.3 Thu May 22 13:44:01 2003
+++ avida/current/source/event/Makefile.am Thu May 22 14:29:00 2003
@@ -1,3 +1,5 @@
+
+
## This is a somewhat ugly hack to build the autogenerated code.
## We pretend that the autogenerated code is actually a program, then
## make builds it correctly. Any other way leads to unnecessary
Index: avida/current/source/main/Makefile.am
diff -u avida/current/source/main/Makefile.am:1.24.2.10 avida/current/source/main/Makefile.am:1.24.2.11
--- avida/current/source/main/Makefile.am:1.24.2.10 Thu May 22 13:44:02 2003
+++ avida/current/source/main/Makefile.am Thu May 22 14:29:00 2003
@@ -1,3 +1,4 @@
+
CPPFLAGS = @CPPFLAGS@
#
Index: avida/current/source/qt-viewer/Makefile.am
diff -u avida/current/source/qt-viewer/Makefile.am:1.44.2.8 avida/current/source/qt-viewer/Makefile.am:1.44.2.9
--- avida/current/source/qt-viewer/Makefile.am:1.44.2.8 Thu May 22 13:44:02 2003
+++ avida/current/source/qt-viewer/Makefile.am Thu May 22 14:29:01 2003
@@ -1,3 +1,4 @@
+
#SUBDIRS = exp
BUILT_SOURCES = qt-viewer.qmakefile
Index: avida/current/source/qt-viewer/exp/share/Makefile.am
diff -u avida/current/source/qt-viewer/exp/share/Makefile.am:1.1.2.2 avida/current/source/qt-viewer/exp/share/Makefile.am:1.1.2.3
--- avida/current/source/qt-viewer/exp/share/Makefile.am:1.1.2.2 Thu May 22 13:44:02 2003
+++ avida/current/source/qt-viewer/exp/share/Makefile.am Thu May 22 14:29:01 2003
@@ -1,3 +1,5 @@
+
+
sharedir = $(datadir)/share
share_DATA = down.xpm right.xpm
Index: avida/current/source/support/Makefile.am
diff -u avida/current/source/support/Makefile.am:1.9.2.5 avida/current/source/support/Makefile.am:1.9.2.6
--- avida/current/source/support/Makefile.am:1.9.2.5 Thu May 22 13:44:03 2003
+++ avida/current/source/support/Makefile.am Thu May 22 14:29:01 2003
@@ -1,3 +1,4 @@
+
data_DATA = analyze.cfg \
environment.cfg \
events.cfg \
Index: avida/current/source/support/preset_organisms/Makefile.am
diff -u avida/current/source/support/preset_organisms/Makefile.am:1.1.2.2 avida/current/source/support/preset_organisms/Makefile.am:1.1.2.3
--- avida/current/source/support/preset_organisms/Makefile.am:1.1.2.2 Thu May 22 13:44:03 2003
+++ avida/current/source/support/preset_organisms/Makefile.am Thu May 22 14:29:01 2003
@@ -1,3 +1,4 @@
+
presetsdir = $(datadir)/preset_organisms
presets_DATA = dummy
Index: avida/current/source/third-party/Makefile.am
diff -u avida/current/source/third-party/Makefile.am:1.1.2.2 avida/current/source/third-party/Makefile.am:1.1.2.3
--- avida/current/source/third-party/Makefile.am:1.1.2.2 Thu May 22 13:44:03 2003
+++ avida/current/source/third-party/Makefile.am Thu May 22 14:29:02 2003
@@ -1 +1,3 @@
+
+
SUBDIRS = trio-1.9
Index: avida/current/source/third-party/trio-1.9/Makefile.am
diff -u avida/current/source/third-party/trio-1.9/Makefile.am:1.1.2.3 avida/current/source/third-party/trio-1.9/Makefile.am:1.1.2.4
--- avida/current/source/third-party/trio-1.9/Makefile.am:1.1.2.3 Thu May 22 13:44:03 2003
+++ avida/current/source/third-party/trio-1.9/Makefile.am Thu May 22 14:29:02 2003
@@ -1,3 +1,4 @@
+
noinst_LIBRARIES = libtrio.a
libtrio_a_SOURCES = \
trio.c trio.h \
Index: avida/current/source/tools/Makefile.am
diff -u avida/current/source/tools/Makefile.am:1.15.2.5 avida/current/source/tools/Makefile.am:1.15.2.6
--- avida/current/source/tools/Makefile.am:1.15.2.5 Thu May 22 13:44:03 2003
+++ avida/current/source/tools/Makefile.am Thu May 22 14:29:02 2003
@@ -1,3 +1,5 @@
+
+
libtools_a_SOURCES = block_struct.cc block_struct.hh \
b_struct2.cc b_struct2.hh \
data_entry.cc data_entry.hh \
Index: avida/current/source/viewers/Makefile.am
diff -u avida/current/source/viewers/Makefile.am:1.13.2.3 avida/current/source/viewers/Makefile.am:1.13.2.4
--- avida/current/source/viewers/Makefile.am:1.13.2.3 Thu May 22 13:44:03 2003
+++ avida/current/source/viewers/Makefile.am Thu May 22 14:29:02 2003
@@ -1,3 +1,4 @@
+
CPPFLAGS = @CPPFLAGS@
#LDFLAGS = -lm $(VIEW_LIBS)
LDFLAGS = -lm -lncurses
More information about the Avida-cvs
mailing list