core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rebranding and lex/yacc gen files

This commit is contained in:
Shahram Najm 2015-02-20 17:56:15 +00:00
parent 5cf67b838a
commit cb5e502719
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -21,9 +21,9 @@ grib_api.spec
grib_api.pc grib_api.pc
grib_api_f90.pc grib_api_f90.pc
perl/GRIB-API/Makefile.PL perl/GRIB-API/Makefile.PL
rpms/grib_api.pc rpms/eccodes.pc
rpms/grib_api.spec rpms/eccodes.spec
rpms/grib_api_f90.pc rpms/eccodes_f90.pc
aclocal.m4 aclocal.m4
src/config.h.in~ src/config.h.in~
python/gribapi.pyc python/gribapi.pyc

21
src/CMakeLists.txt
View File

@ -352,6 +352,8 @@ list( APPEND grib_api_srcs
grib_accessor_class_uint8.c grib_accessor_class_uint8.c
grib_accessor_class_blob.c grib_accessor_class_blob.c
eccodes_windef.h eccodes_windef.h
# We ship our own generated lex/yacc C files
grib_yacc.c grib_lex.c
) )
list( APPEND grib_api_extra_srcs list( APPEND grib_api_extra_srcs
@ -367,18 +369,19 @@ list( APPEND grib_api_extra_srcs
configure_file( grib_api_version.c.in grib_api_version.c @ONLY ) configure_file( grib_api_version.c.in grib_api_version.c @ONLY )
ecbuild_generate_yy(YYPREFIX grib_yy # We ship our own generated lex/yacc C files
YACC griby #ecbuild_generate_yy(YYPREFIX grib_yy
LEX gribl # YACC griby
FLEX_FLAGS " " # LEX gribl
LEX_FLAGS " " # FLEX_FLAGS " "
BISON_FLAGS "-y" # LEX_FLAGS " "
YACC_FLAGS "-y" # BISON_FLAGS "-y"
DEPENDANT action.c ) # YACC_FLAGS "-y"
# DEPENDANT action.c )
ecbuild_add_library(TARGET eccodes ecbuild_add_library(TARGET eccodes
SOURCES grib_api_version.c SOURCES grib_api_version.c
griby.c gribl.c # griby.c gribl.c
${grib_api_srcs} ${grib_api_srcs}
GENERATED grib_api_version.c GENERATED grib_api_version.c
LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}