[avida-cvs] avida CVS commits: /current/source modules.pri /current/source/event population_event_factory.hh /current/source/main Makefile.am

[kaben]

kaben		Wed Oct 15 19:59:21 2003 EDT

  Modified files:              
    /avida/current/source	modules.pri 
    /avida/current/source/event	population_event_factory.hh 
    /avida/current/source/main	Makefile.am 
  Log:
  Build of qt-viewer fails on Jason's ninhursag, under a new version of Qt, which can't find autogenerated event include files.  Made changes to include paths in makefile to point out the lost files.
  
Index: avida/current/source/modules.pri
diff -u avida/current/source/modules.pri:1.3 avida/current/source/modules.pri:1.4
--- avida/current/source/modules.pri:1.3	Wed Jun  4 11:34:45 2003
+++ avida/current/source/modules.pri	Wed Oct 15 19:59:20 2003
@@ -23,6 +23,7 @@
 DEPENDPATH += ;$$TOOLS_HH
 DEPENDPATH += ;$$SUPPORT_HH
 DEPENDPATH += ;$$DOC_HH
+DEPENDPATH += ;.
 
 INCLUDEPATH += $$DEPENDPATH
 
Index: avida/current/source/event/population_event_factory.hh
diff -u avida/current/source/event/population_event_factory.hh:1.4 avida/current/source/event/population_event_factory.hh:1.5
--- avida/current/source/event/population_event_factory.hh:1.4	Wed Oct 15 19:17:03 2003
+++ avida/current/source/event/population_event_factory.hh	Wed Oct 15 19:59:21 2003
@@ -40,7 +40,7 @@
 
 public:
   // event enums
-#include "../event/cPopulation_enums_auto.ci"
+#include "cPopulation_enums_auto.ci"
 
   cPopulationEventFactory( cPopulation *pop );
   ~cPopulationEventFactory();
Index: avida/current/source/main/Makefile.am
diff -u avida/current/source/main/Makefile.am:1.34 avida/current/source/main/Makefile.am:1.35
--- avida/current/source/main/Makefile.am:1.34	Mon Oct  6 16:26:16 2003
+++ avida/current/source/main/Makefile.am	Wed Oct 15 19:59:21 2003
@@ -16,9 +16,9 @@
 #
 # don't know why it was needed.
 #
-AVIDA_EVENT_DIR = $(srcdir)/../event
-AVIDA_CPU_DIR = $(srcdir)/../cpu
-INCLUDES = -I$(AVIDA_EVENT_DIR) -I$(AVIDA_CPU_DIR)
+AVIDA_EVENT_DIR = -I$(srcdir)/../event -I../event
+AVIDA_CPU_DIR = -I$(srcdir)/../cpu
+INCLUDES = $(AVIDA_EVENT_DIR) $(AVIDA_CPU_DIR)
 #
 
 libmain_a_SOURCES = analyze.hh		analyze.cc		\