Rename c_interop to c_wrapper

This commit is contained in:
Serge Lamikhov-Center 2020-10-11 10:08:49 +03:00
parent 91fc3ea58c
commit 8597197741
14 changed files with 29 additions and 29 deletions

2
.gitignore vendored
View File

@ -49,7 +49,7 @@ tests/elf_examples/zavl_gen.ko
examples/writer/hello_x86_64
examples/write_obj/hello
examples/c_interop/c_example
examples/c_wrapper/c_example
examples/add_section/add_section
# various unwanted files (backups, objects, cmake artifacts)

View File

@ -9,4 +9,4 @@ add_subdirectory(examples/elfdump)
add_subdirectory(examples/tutorial)
add_subdirectory(examples/write_obj)
add_subdirectory(examples/writer)
add_subdirectory(examples/c_interop)
add_subdirectory(examples/c_wrapper)

View File

@ -1,5 +1,5 @@
SUBDIRS = examples/elfdump examples/tutorial examples/writer examples/write_obj \
examples/anonymizer examples/add_section examples/c_interop
examples/anonymizer examples/add_section examples/c_wrapper
nobase_include_HEADERS = elfio/elf_types.hpp elfio/elfio_dynamic.hpp \
elfio/elfio.hpp elfio/elfio_header.hpp \
elfio/elfio_note.hpp elfio/elfio_relocation.hpp \

View File

@ -319,7 +319,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = examples/elfdump examples/tutorial examples/writer examples/write_obj \
examples/anonymizer examples/add_section examples/c_interop
examples/anonymizer examples/add_section examples/c_wrapper
nobase_include_HEADERS = elfio/elf_types.hpp elfio/elfio_dynamic.hpp \
elfio/elfio.hpp elfio/elfio_header.hpp \

4
configure vendored
View File

@ -3873,7 +3873,7 @@ else
fi
ac_config_files="$ac_config_files Makefile examples/elfdump/Makefile examples/tutorial/Makefile examples/writer/Makefile examples/anonymizer/Makefile examples/write_obj/Makefile examples/add_section/Makefile examples/c_interop/Makefile"
ac_config_files="$ac_config_files Makefile examples/elfdump/Makefile examples/tutorial/Makefile examples/writer/Makefile examples/anonymizer/Makefile examples/write_obj/Makefile examples/add_section/Makefile examples/c_wrapper/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -4628,7 +4628,7 @@ do
"examples/anonymizer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/anonymizer/Makefile" ;;
"examples/write_obj/Makefile") CONFIG_FILES="$CONFIG_FILES examples/write_obj/Makefile" ;;
"examples/add_section/Makefile") CONFIG_FILES="$CONFIG_FILES examples/add_section/Makefile" ;;
"examples/c_interop/Makefile") CONFIG_FILES="$CONFIG_FILES examples/c_interop/Makefile" ;;
"examples/c_wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES examples/c_wrapper/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac

View File

@ -10,6 +10,6 @@ AC_CONFIG_FILES([
examples/anonymizer/Makefile
examples/write_obj/Makefile
examples/add_section/Makefile
examples/c_interop/Makefile
examples/c_wrapper/Makefile
])
AC_OUTPUT

View File

@ -1,3 +0,0 @@
add_executable(c_example c_example.c elfio_c_interop.cpp elfio_c_interop.h)
include_directories(SYSTEM ${CMAKE_SOURCE_DIR})

View File

@ -1,4 +0,0 @@
AM_CPPFLAGS = -I$(top_srcdir)
bin_PROGRAMS = c_example
c_example_SOURCES = c_example.c elfio_c_interop.cpp
EXTRA_DIST = elfio_c_interop.h CMakeLists.txt

View File

@ -0,0 +1,3 @@
add_executable(c_example c_example.c elfio_c_wrapper.cpp elfio_c_wrapper.h)
include_directories(SYSTEM ${CMAKE_SOURCE_DIR})

View File

@ -0,0 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)
bin_PROGRAMS = c_example
c_example_SOURCES = c_example.c elfio_c_wrapper.cpp
EXTRA_DIST = elfio_c_wrapper.h CMakeLists.txt

View File

@ -87,7 +87,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
bin_PROGRAMS = c_example$(EXEEXT)
subdir = examples/c_interop
subdir = examples/c_wrapper
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/elfio/elfio_version.hpp \
$(top_srcdir)/configure.ac
@ -99,7 +99,7 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_c_example_OBJECTS = c_example.$(OBJEXT) elfio_c_interop.$(OBJEXT)
am_c_example_OBJECTS = c_example.$(OBJEXT) elfio_c_wrapper.$(OBJEXT)
c_example_OBJECTS = $(am_c_example_OBJECTS)
c_example_LDADD = $(LDADD)
AM_V_P = $(am__v_P_@AM_V@)
@ -118,7 +118,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/c_example.Po \
./$(DEPDIR)/elfio_c_interop.Po
./$(DEPDIR)/elfio_c_wrapper.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -263,8 +263,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)
c_example_SOURCES = c_example.c elfio_c_interop.cpp
EXTRA_DIST = elfio_c_interop.h CMakeLists.txt
c_example_SOURCES = c_example.c elfio_c_wrapper.cpp
EXTRA_DIST = elfio_c_wrapper.h CMakeLists.txt
all: all-am
.SUFFIXES:
@ -278,9 +278,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/c_interop/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/c_wrapper/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign examples/c_interop/Makefile
$(AUTOMAKE) --foreign examples/c_wrapper/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@ -352,7 +352,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_example.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfio_c_interop.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfio_c_wrapper.Po@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@ -516,7 +516,7 @@ clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -f ./$(DEPDIR)/c_example.Po
-rm -f ./$(DEPDIR)/elfio_c_interop.Po
-rm -f ./$(DEPDIR)/elfio_c_wrapper.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@ -563,7 +563,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/c_example.Po
-rm -f ./$(DEPDIR)/elfio_c_interop.Po
-rm -f ./$(DEPDIR)/elfio_c_wrapper.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

View File

@ -1,7 +1,7 @@
#include <stdio.h>
#include <elfio/elf_types.hpp>
#include "elfio_c_interop.h"
#include "elfio_c_wrapper.h"
int main( int argc, char* argv[] )
{

View File

@ -25,7 +25,7 @@ THE SOFTWARE.
using namespace ELFIO;
#include "elfio_c_interop.h"
#include "elfio_c_wrapper.h"
//-----------------------------------------------------------------------------
// elfio

View File

@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#ifndef ELFIO_C_INTEROP_H
#define ELFIO_C_INTEROP_H
#ifndef ELFIO_C_WRAPPER_H
#define ELFIO_C_WRAPPER_H
#define ELFIO_C_HEADER_ACCESS_GET( TYPE, FNAME ) \
TYPE elfio_get_##FNAME( pelfio_t pelfio );
@ -201,4 +201,4 @@ typedef int bool;
}
#endif
#endif // ELFIO_C_INTEROP_H
#endif // ELFIO_C_WRAPPER_H