Changeset 200

Show
Ignore:
Timestamp:
07/03/06 09:49:14 (2 years ago)
Author:
xi
Message:

Move yaml/yaml.h to yaml.h and merge version.c to api.c.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • libyaml/trunk/include/Makefile.am

    r178 r200  
    1 INCLUDES = yaml/yaml.h #yaml/yaml_version.h yaml/yaml_error.h 
     1INCLUDES = yaml.h 
    22DOXYGEN_CFG = $(top_srcdir)/doc/doxygen.cfg 
    33 

  • libyaml/trunk/src/Makefile.am

    r184 r200  
    11AM_CPPFLAGS = -I$(top_srcdir)/include 
    22lib_LTLIBRARIES = libyaml.la 
    3 libyaml_la_SOURCES = version.c api.c reader.c scanner.c 
     3libyaml_la_SOURCES = api.c reader.c scanner.c 
    44libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) 

  • libyaml/trunk/src/api.c

    r199 r200  
    44#endif 
    55 
    6 #include <yaml/yaml.h> 
     6#include <yaml.h> 
    77 
    88#include <assert.h> 
     9 
     10YAML_DECLARE(const char *) 
     11yaml_get_version_string(void) 
     12{ 
     13    return YAML_VERSION_STRING; 
     14} 
     15 
     16YAML_DECLARE(void) 
     17yaml_get_version(int *major, int *minor, int *patch) 
     18{ 
     19    *major = YAML_VERSION_MAJOR; 
     20    *minor = YAML_VERSION_MINOR; 
     21    *patch = YAML_VERSION_PATCH; 
     22} 
    923 
    1024/* 

  • libyaml/trunk/src/reader.c

    r199 r200  
    44#endif 
    55 
    6 #include <yaml/yaml.h> 
     6#include <yaml.h> 
    77 
    88#include <assert.h> 

  • libyaml/trunk/src/scanner.c

    r194 r200  
    480480#endif 
    481481 
    482 #include <yaml/yaml.h> 
     482#include <yaml.h> 
    483483 
    484484#include <assert.h> 

  • libyaml/trunk/tests/test-reader.c

    r182 r200  
    1 #include <yaml/yaml.h> 
     1#include <yaml.h> 
    22 
    33#include <stdlib.h> 

  • libyaml/trunk/tests/test-version.c

    r172 r200  
    1 #include <yaml/yaml.h> 
     1#include <yaml.h> 
    22 
    33#include <stdlib.h>