Changeset 1319 for trunk


Ignore:
Timestamp:
May 21, 2008, 6:03:42 PM (13 years ago)
Author:
Peter
Message:

config.h is no longer installed. Therefore, do not include config.h
into other header files. Instead there is a yat/yat-config.h which
will be installed and can therefore be used in header files. The
yat-config contains the same information as config.h but variables are
prefix'd with a YAT_. I had to change style in version.m4 due to a
variable clash between variables set in version.m4 and variables I
wanted in config.h.

Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r1275 r1319  
    2828SUBDIRS = yat test doc
    2929
    30 include_yatdir = $(includedir)/yat
    31 
    32 include_yat_HEADERS = config.h
    33 
    3430.PHONY: doc
    3531doc:; @(cd doc; $(MAKE) $@)
  • trunk/NEWS

    r1312 r1319  
    88  - is_int now depends on numerical_limits for inf and NaN treatment
    99  - Similar for is_float. See revision [1312] for details.
     10  - yat-config.h is installed rather than config.h
    1011
    1112Version 0.4.1 (released 14 May 2008)
  • trunk/build_support/version.m4

    r1307 r1319  
    2525#
    2626# MAJOR - Modify when incompatible changes are made
    27 m4_define([MAJOR_VERSION], [0])
     27m4_define([yat_major_version], [0])
    2828# MINOR - Modify when new functionality is added
    29 m4_define([MINOR_VERSION], [5])
     29m4_define([yat_minor_version], [5])
    3030# PATCH - Modify for every released patch
    31 m4_define([PATCH_VERSION], [0])
     31m4_define([yat_patch_version], [0])
    3232
    3333# DEV_BUILD - When rolling a tarball we set this to `false'. In
    3434# repository value remains `true'.
    35 m4_define([DEV_BUILD], [true])
     35m4_define([yat_dev_build], [true])
    3636
    3737# Library versioning (current:revision:age)
     
    5454# yat-0.4.1  1:0:0
    5555#
    56 m4_define([LT_VERSION], [1:0:0])
     56m4_define([yat_lt_version], [1:0:0])
    5757
    5858
     
    6262
    6363# Setting YAT_VERSION based upon settings above
    64 m4_define([YAT_VERSION],MAJOR_VERSION.MINOR_VERSION)
     64m4_define([yat_version],yat_major_version.yat_minor_version)
    6565# disregarding patch number if zero
    66 m4_define([YAT_VERSION], m4_if(PATCH_VERSION,[0], YAT_VERSION,
    67                                   YAT_VERSION.PATCH_VERSION))
    68 m4_define([YAT_VERSION], m4_if(DEV_BUILD,[true], YAT_VERSION[pre],
    69                                   YAT_VERSION))
     66m4_define([yat_version], m4_if(yat_patch_version,[0], yat_version,
     67                                  yat_version.yat_patch_version))
     68m4_define([yat_version], m4_if(yat_dev_build,[true], yat_version[pre],
     69                                  yat_version))
    7070
  • trunk/configure.ac

    r1303 r1319  
    3333
    3434m4_include([./build_support/version.m4])
    35 AC_INIT([yat],[YAT_VERSION],[jari@thep.lu.se])
     35AC_INIT([yat],[yat_version],[jari@thep.lu.se])
    3636AC_PREREQ(2.60)
    3737AC_CONFIG_SRCDIR([yat/utility/Matrix.h])
     
    3939AC_PREFIX_DEFAULT([/usr/local])
    4040
    41 AC_SUBST([YAT_LT_VERSION], [LT_VERSION])
    42 AC_SUBST([YAT_MAJOR_VERSION], [MAJOR_VERSION])
    43 AC_SUBST([YAT_MINOR_VERSION], [MINOR_VERSION])
    44 AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
     41AC_SUBST([YAT_LT_VERSION], [yat_lt_version])
     42AC_SUBST([YAT_MAJOR_VERSION], [yat_major_version])
     43AC_SUBST([YAT_MINOR_VERSION], [yat_minor_version])
     44AC_SUBST([YAT_PATCH_VERSION], [yat_patch_version])
    4545
    4646AC_CONFIG_HEADER([config.h])
     47m4_include(build_support/ax_prefix_config_h.m4)
     48AX_PREFIX_CONFIG_H(yat/[AC_PACKAGE_NAME]-config.h,, config.h)
     49
    4750AM_INIT_AUTOMAKE()
    4851
     
    158161AC_SUBST(YAT_LIB)
    159162AC_SUBST(YAT_LIB_LOCATION)
    160 AC_DEFINE([YAT_MAJOR_VERSION],[MAJOR_VERSION], [Define to yat MAJOR version])
    161 AC_DEFINE([YAT_MINOR_VERSION],[MINOR_VERSION], [Define to yat MINOR version])
    162 AC_DEFINE([YAT_PATCH_VERSION],[PATCH_VERSION], [Define to yat PATCH version])
    163 AC_DEFINE([YAT_DEV_BUILD],[DEV_BUILD], [false if tagged release])
     163AC_DEFINE([MAJOR_VERSION], [yat_major_version], [Define to yat MAJOR version])
     164AC_DEFINE([MINOR_VERSION],[yat_minor_version], [Define to yat MINOR version])
     165AC_DEFINE([PATCH_VERSION],[yat_patch_version], [Define to yat PATCH version])
     166AC_DEFINE([DEV_BUILD],[yat_dev_build], [false if tagged release])
    164167
    165168#doxygen stuff
  • trunk/yat/Makefile.am

    r1275 r1319  
    2727SUBDIRS = classifier random regression statistics utility
    2828
     29include_yatdir = $(includedir)/yat
     30
     31include_yat_HEADERS = yat-config.h
     32
    2933lib_LTLIBRARIES = libyat.la
    3034
  • trunk/yat/utility/version.cc

    r1316 r1319  
    2323
    2424#include "version.h"
    25 #include "config.h"
     25#include "yat/yat-config.h"
    2626
    2727namespace theplu {
     
    4949  std::string version(void)
    5050  {
    51     return VERSION;
     51    return YAT_VERSION;
    5252  }
    5353
Note: See TracChangeset for help on using the changeset viewer.