From 154e0732a81beb63e73c440cce39cf73fb9cd7ac Mon Sep 17 00:00:00 2001 From: Vincent Danjean Date: Tue, 3 Dec 2013 00:42:09 +0100 Subject: [PATCH] All generated file ends with "_gen" suffix (but installed once) Only ocl_icd.h and ocl_icd_bindings.c are generated sources without _gen suffix --- Makefile.am | 16 ++++++++-------- icd_generator.rb | 6 +++--- ocl_icd_loader.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 ocl_icd_loader.h diff --git a/Makefile.am b/Makefile.am index fbabd80..3f1e7d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,11 +17,11 @@ EXTRA_DIST=icd_generator.rb ocl_interface.yaml bootstrap \ lib_LTLIBRARIES = libOpenCL.la nodist_include_HEADERS = ocl_icd.h pkgexampledir = $(docdir)/examples -pkgexample_DATA = ocl_icd_loader.map ocl_icd_bindings.c +pkgexample_DATA = ocl_icd_bindings.c -FILES_FROM_DATABASE = ocl_icd.h ocl_icd_loader.h \ +FILES_FROM_DATABASE = ocl_icd.h ocl_icd_loader_gen.h \ ocl_icd_loader_gen.c ocl_icd_bindings.c \ - ocl_icd_loader.map + ocl_icd_loader_gen.map BUILT_SOURCES = $(FILES_FROM_DATABASE) CLEANFILES = $(FILES_FROM_DATABASE) stamp-generator @@ -43,13 +43,13 @@ stamp-generator: icd_generator.rb libOpenCL_la_CFLAGS= $(NO_DEPRECATED_DECLARATIONS_FLAGS) \ $(AM_CFLAGS) $(PTHREAD_CFLAGS) -libOpenCL_la_SOURCES = ocl_icd_loader.c ocl_icd_debug.h +libOpenCL_la_SOURCES = ocl_icd_loader.c ocl_icd_loader.h ocl_icd_debug.h nodist_libOpenCL_la_SOURCES = ocl_icd_loader_gen.c ocl_icd.h libOpenCL_la_LDFLAGS = -version-info 1:0:0 $(PTHREAD_CFLAGS) libOpenCL_la_LIBADD = $(PTHREAD_LIBS) if USE_MAP -libOpenCL_la_LDFLAGS += -Wl,--version-script,ocl_icd_loader.map -libOpenCL_la_DEPENDS = ocl_icd_loader.map +libOpenCL_la_LDFLAGS += -Wl,--version-script,ocl_icd_loader_gen.map +libOpenCL_la_DEPENDS = ocl_icd_loader_gen.map endif #################################### @@ -75,7 +75,7 @@ clean-local: mostlyclean-generic clean-generic ################################################################## # dummy OpenCL ICD -FILES_FROM_GENERATOR = run_dummy_icd_gen.c run_dummy_icd_weak.c \ +FILES_FROM_GENERATOR = run_dummy_icd_gen.c run_dummy_icd_weak_gen.c \ libdummy_icd_gen.c libdummy_icd_gen.h BUILT_SOURCES += $(FILES_FROM_GENERATOR) CLEANFILES += $(FILES_FROM_GENERATOR) stamp-generator-dummy @@ -102,7 +102,7 @@ libdummycl_noext_la_CPPFLAGS = $(AM_CPPFLAGS) -DICD_WITHOUT_EXTENSION noinst_PROGRAMS=run_dummy_icd_through_our_ICDL run_dummy_icd_through_our_ICDL_SOURCES = run_dummy_icd.c nodist_run_dummy_icd_through_our_ICDL_SOURCES = \ - run_dummy_icd_gen.c run_dummy_icd_weak.c + run_dummy_icd_gen.c run_dummy_icd_weak_gen.c # ignore the warning in OpenCL headers when using old interface run_dummy_icd_through_our_ICDL_CFLAGS= $(NO_DEPRECATED_DECLARATIONS_FLAGS) $(AM_CFLAGS) # we want to link to our implementation here diff --git a/icd_generator.rb b/icd_generator.rb index 7766c34..29b9eaa 100644 --- a/icd_generator.rb +++ b/icd_generator.rb @@ -297,7 +297,7 @@ EOF File.open('run_dummy_icd_gen.c','w') { |f| f.puts generate_run_dummy_icd_source } - File.open('run_dummy_icd_weak.c','w') { |f| + File.open('run_dummy_icd_weak_gen.c','w') { |f| f.puts generate_run_dummy_icd_weak_source } end @@ -620,10 +620,10 @@ EOF File.open('ocl_icd.h','w') { |f| f.puts generate_ocl_icd_header } - File.open('ocl_icd_loader.h','w') { |f| + File.open('ocl_icd_loader_gen.h','w') { |f| f.puts generate_ocl_icd_loader_header } - File.open('ocl_icd_loader.map','w') { |f| + File.open('ocl_icd_loader_gen.map','w') { |f| f.puts generate_ocl_icd_loader_map } File.open('ocl_icd_bindings.c','w') { |f| diff --git a/ocl_icd_loader.h b/ocl_icd_loader.h new file mode 100644 index 0000000..3cea2a7 --- /dev/null +++ b/ocl_icd_loader.h @@ -0,0 +1,34 @@ +/** +Copyright (c) 2013, Brice Videau +Copyright (c) 2013, Vincent Danjean +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ + +#ifndef __OCL_ICD_LOADER_H +#define __OCL_ICD_LOADER_H + +#include "ocl_icd.h" +#include "ocl_icd_loader_gen.h" + +#endif -- 2.32.0.93.g670b81a890