ChangeLogTag: Fri Feb 2 17:47:09 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

8 files changed, 63 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 68b73b11..262efeae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+Fri Feb  2 17:47:09 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/swig_php.mpb:
+
+          Added /. after $(PHP_INCLUDE) in the includes setting.  In case
+          the PHP_INCLUDE environment variable is not set, something is
+          still passed to the -I option.
+
+        * config/ziparchive.mpb:
+
+          Added /. after $(ZIPARCHIVEROOT) in the includes setting.  In case
+          the ZIPARCHIVEROOT environment variable is not set, something is
+          still passed to the -I option.
+
+          And switched to lit_libs.
+
+        * config/zzip.mpb:
+
+          For non-Windows based project types, use lit_libs instead of libs.
+
+        * docs/templates/automake.txt:
+
+          Documented the automake template variables.
+
+        * docs/templates/common.txt:
+
+          Added the definition of the forcount template variable.
+
+        * modules/AutomakeProjectCreator.pm:
+        * templates/automake.mpd:
+
+          Replaced the am_includes template variable with the includes
+          project variable.  In the past, these were different but now they
+          are exactly the same.
+
 Thu Feb  1 18:29:19 UTC 2007  James H. Hill  <hillj@isis.vanderbilt.edu>
 
         * docs/templates/vc7.txt:
diff --git a/config/swig_php.mpb b/config/swig_php.mpb
index 1d121330..f97e700d 100644
--- a/config/swig_php.mpb
+++ b/config/swig_php.mpb
@@ -13,7 +13,7 @@ project {
     generic_outputext   = .php
   }
   requires += swig_php
-  includes += $(PHP_INCLUDE) $(PHP_INCLUDE)/main $(PHP_INCLUDE)/Zend \
+  includes += $(PHP_INCLUDE)/. $(PHP_INCLUDE)/main $(PHP_INCLUDE)/Zend \
               $(PHP_INCLUDE)/TSRM
   libpaths += $(PHP_LIBPATH)/.
 }
diff --git a/config/ziparchive.mpb b/config/ziparchive.mpb
index a080cc4a..6e80d7d3 100644
--- a/config/ziparchive.mpb
+++ b/config/ziparchive.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 feature(ziparchive) {
-  includes += $(ZIPARCHIVEROOT)
+  includes += $(ZIPARCHIVEROOT)/.
   libpaths += $(ZIPARCHIVEROOT)/lib
-  libs += ziparch
+  lit_libs += ziparch
 }
\ No newline at end of file
diff --git a/config/zzip.mpb b/config/zzip.mpb
index 22fed316..ac8fb0be 100644
--- a/config/zzip.mpb
+++ b/config/zzip.mpb
@@ -10,7 +10,7 @@ feature(zzip): zlib {
   // @@ Notice: If you are building with Cygwin, you may need to manually
   //            change the following library to zziplib.
   specific(gnuace, make, sle, automake, ghs) {
-    libs += zzip
+    lit_libs += zzip
   } else {
     libs += zziplib
   }
diff --git a/docs/templates/automake.txt b/docs/templates/automake.txt
new file mode 100644
index 00000000..751c764d
--- /dev/null
+++ b/docs/templates/automake.txt
@@ -0,0 +1,19 @@
+// Current as of 2/2/2007
+// This defines the role of all the template variables specific to the
+// 'automake' project type.
+//
+// Please try to keep this alphabetically sorted.
+//
+am_release = Provides the value to use with the -release option when creating a shared library.
+am_version = Provides an automake'ized version string based on the 'version' project variable.
+common_defines = Specifies macros that are common to all target types.
+defines = Macros that are specific to a particular configuration.
+idl_files = When a Define_Custom(IDL) is used, they will be accessible through this variable name.
+includedir = Specifies the include directory for the specific project.
+install_headers = If set, header, inline, template, idl, and pidl files will be installed.
+install_this_target = If set, script files, executables and library targets will be installed.  For libraries, it also determines if it will be dynamic (set) or static (not set).
+man_files = When a Define_Custom(MAN) is used, they will be accessible through this variable name.
+pidl_files = When a Define_Custom(PIDL) is used, they will be accessible through this variable name.
+pkgconfig_files = When a Define_Custom(pkgconfig) is used, they will be accessible through this variable name.
+script_files = When a Define_Custom(Script) is used, they will be accessible through this variable name.
+use_lib_modifier_for_lit_libs = If this template variable is set, the 'lib_modifier' template variable value will be appended to the library names of those specified by the 'lit_libs' project variable.
diff --git a/docs/templates/common.txt b/docs/templates/common.txt
index 1f3b300b..f4797f7d 100644
--- a/docs/templates/common.txt
+++ b/docs/templates/common.txt
@@ -7,6 +7,7 @@ configurations = This determines build configurations (ex. Debug, Release, etc.)
 cwd = The current working directory of the project.
 dll_ext = The dynamic library extension.  The value for this depends on the project type.
 exe_ext = The executable extension.  The value for this depends on the project type.
+forcount = The count of the number of times iteration has occurred within the current foreach loop.  The base value is determined by the foreach declaration.
 intermediate_dir = A configuration specific location where object files are placed.
 lib_ext = The static or impl library extension.  The value for this depends on the project type.
 lib_modifier = Used to modifier a library name.  The value of this is appendend to the library name before the extension is added.
diff --git a/modules/AutomakeProjectCreator.pm b/modules/AutomakeProjectCreator.pm
index 99bde870..84f419f7 100644
--- a/modules/AutomakeProjectCreator.pm
+++ b/modules/AutomakeProjectCreator.pm
@@ -33,22 +33,7 @@ sub fill_value {
   my($name)  = shift;
   my($value) = undef;
 
-  if ($name eq 'am_includes') {
-    my($incs) = $self->get_assignment('includes');
-    if (defined $incs) {
-      my(@vec) = split(' ', $incs);
-
-#      # The following prefixes include paths with $(srcdir)/.
-#      foreach(@vec) {
-#        if (/^[^\$\/]/) {
-#          $_ = '$(srcdir)/' . $_;
-#        }
-#      }
-
-      $value = \@vec;
-    }
-  }
-  elsif ($name eq 'am_version') {
+  if ($name eq 'am_version') {
     $value = $self->get_assignment('version');
     if (defined $value) {
       if (($value =~ tr/./:/) < 2) {
diff --git a/templates/automake.mpd b/templates/automake.mpd
index 6d85ae28..e9013a82 100644
--- a/templates/automake.mpd
+++ b/templates/automake.mpd
@@ -89,15 +89,15 @@ CLEANFILES += \
 <%endif%>
 <%endif%>
 <%endif%>
-<%if(am_includes || defines || common_defines || macros || need_staticflags || dynamicflags || compile_flags)%>
+<%if(includes || defines || common_defines || macros || need_staticflags || dynamicflags || compile_flags)%>
 
 <%if(exename)%>
 <%normalize(exename)%>_CPPFLAGS<%if(configurations)%>_COMMON<%endif%> = \
 <%else%>
 lib<%libname_prefix%><%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%><%endif%><%if(!configurations)%>_la<%endif%>_CPPFLAGS<%if(configurations)%>_COMMON<%endif%> = \
 <%endif%>
-<%foreach(am_includes)%>
-  -I<%am_include%><%if(defines || common_defines || macros || need_staticflags || dynamicflags || compile_flags && !configurations)%> \<%else%><%fornotlast(" \\")%><%endif%>
+<%foreach(includes)%>
+  -I<%include%><%if(defines || common_defines || macros || need_staticflags || dynamicflags || compile_flags && !configurations)%> \<%else%><%fornotlast(" \\")%><%endif%>
 <%endfor%>
 <%foreach(defines common_defines macros)%>
   -D<%define%><%if(need_staticflags || dynamicflags || compile_flags && !configurations)%> \<%else%><%fornotlast(" \\")%><%endif%>