hyung-hwan/hawk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed build files to move c++ objects to libhawk from libhawkxx

Browse Source
This commit is contained in:
hyung-hwan 2020-01-09 04:34:21 +00:00
parent 8d23aa3ab7
commit ba8cb99231
8 changed files with 65 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hawk/bin/Makefile.am
View File

@ -1,5 +1,7 @@
AUTOMAKE_OPTIONS = nostdinc AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = $(PTHREAD_CFLAGS)
CPPFLAGS_ALL_COMMON = \ CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \ -I$(abs_builddir) \
-I$(abs_builddir)/../lib \ -I$(abs_builddir)/../lib \
@ -21,6 +23,6 @@ bin_PROGRAMS = hawk
hawk_SOURCES = main.c hawk_SOURCES = main.c
hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON) hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON)
hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawk hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) $(PTHREAD_LIBS) -lhawk
hawk_DEPENDENCIES = ../lib/libhawk.la hawk_DEPENDENCIES = ../lib/libhawk.la

3
hawk/bin/Makefile.in
View File

@ -341,6 +341,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc AUTOMAKE_OPTIONS = nostdinc
AM_CPPFLAGS = $(PTHREAD_CFLAGS)
CPPFLAGS_ALL_COMMON = \ CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \ -I$(abs_builddir) \
-I$(abs_builddir)/../lib \ -I$(abs_builddir)/../lib \
@ -359,7 +360,7 @@ LIBADD_BIN_COMMON = $(LIBM)
hawk_SOURCES = main.c hawk_SOURCES = main.c
hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON) hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON)
hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawk hawk_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) $(PTHREAD_LIBS) -lhawk
hawk_DEPENDENCIES = ../lib/libhawk.la hawk_DEPENDENCIES = ../lib/libhawk.la
all: all-am all: all-am

4
hawk/lib/HawkStd.cpp
View File

@ -1144,12 +1144,12 @@ void HawkStd::freeMem (void* ptr)
hawk_flt_t HawkStd::pow (hawk_flt_t x, hawk_flt_t y) hawk_flt_t HawkStd::pow (hawk_flt_t x, hawk_flt_t y)
{ {
return hawk_stdmathpow (this->hawk, x, y); return hawk_stdmathpow(this->hawk, x, y);
} }
hawk_flt_t HawkStd::mod (hawk_flt_t x, hawk_flt_t y) hawk_flt_t HawkStd::mod (hawk_flt_t x, hawk_flt_t y)
{ {
return hawk_stdmathmod (this->hawk, x, y); return hawk_stdmathmod(this->hawk, x, y);
} }
void* HawkStd::modopen (const hawk_mod_spec_t* spec) void* HawkStd::modopen (const hawk_mod_spec_t* spec)

10
hawk/lib/Makefile.am
View File

@ -1,6 +1,7 @@
AUTOMAKE_OPTIONS = nostdinc AUTOMAKE_OPTIONS = nostdinc
AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
CPPFLAGS_ALL_COMMON = \ CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \ -I$(abs_builddir) \
@ -19,7 +20,7 @@ endif
CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON)
LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
LIBADD_LIB_COMMON = $(LIBM) LIBADD_LIB_COMMON = $(LIBM) $(PTHREAD_LIBS)
DEPENDENCIES_LIB_COMMON = DEPENDENCIES_LIB_COMMON =
if WIN32 if WIN32
@ -159,12 +160,7 @@ endif
if ENABLE_CXX if ENABLE_CXX
pkginclude_HEADERS += Hawk.hpp HawkStd.hpp pkginclude_HEADERS += Hawk.hpp HawkStd.hpp
pkglib_LTLIBRARIES += libhawkxx.la libhawk_la_SOURCES += Hawk.cpp HawkStd.cpp
libhawkxx_la_SOURCES = Hawk.cpp HawkStd.cpp
libhawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
libhawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libhawkxx_la_LIBADD = -lhawk $(LIBADD_LIB_COMMON)
libhawkxx_la_DEPENDENCIES = libhawk.la
endif endif
if ENABLE_STATIC_MODULE if ENABLE_STATIC_MODULE

100
hawk/lib/Makefile.in
View File

@ -94,7 +94,7 @@ host_triplet = @host@
@ENABLE_LIBLTDL_FALSE@am__append_5 = $(DL_LIBS) @ENABLE_LIBLTDL_FALSE@am__append_5 = $(DL_LIBS)
@ENABLE_LIBUNWIND_TRUE@am__append_6 = $(UNWIND_LIBS) @ENABLE_LIBUNWIND_TRUE@am__append_6 = $(UNWIND_LIBS)
@ENABLE_CXX_TRUE@am__append_7 = Hawk.hpp HawkStd.hpp @ENABLE_CXX_TRUE@am__append_7 = Hawk.hpp HawkStd.hpp
@ENABLE_CXX_TRUE@am__append_8 = libhawkxx.la @ENABLE_CXX_TRUE@am__append_8 = Hawk.cpp HawkStd.cpp
################################################## ##################################################
# STATIC MODULES BUILT INTO MAIN LIBRARY # STATIC MODULES BUILT INTO MAIN LIBRARY
@ -198,7 +198,7 @@ libhawk_sys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$@ $@
@ENABLE_STATIC_MODULE_FALSE@am_libhawk_sys_la_rpath = -rpath \ @ENABLE_STATIC_MODULE_FALSE@am_libhawk_sys_la_rpath = -rpath \
@ENABLE_STATIC_MODULE_FALSE@ $(pkglibdir) @ENABLE_STATIC_MODULE_FALSE@ $(pkglibdir)
am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@ENABLE_LIBLTDL_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) @ENABLE_LIBLTDL_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
@ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) @ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
@ENABLE_LIBUNWIND_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) @ENABLE_LIBUNWIND_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
@ -216,11 +216,14 @@ am__libhawk_la_SOURCES_DIST = hawk.h hawk-chr.h hawk-cmn.h hawk-dir.h \
utl-ass.c utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c \ utl-ass.c utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c \
utl.c val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h \ utl.c val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h \
hawk-pio.h hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c \ hawk-pio.h hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c \
syscall.h tio.c std-prv.h std.c imap-imp.h mod-math.c \ syscall.h tio.c std-prv.h std.c Hawk.cpp HawkStd.cpp \
mod-math.h mod-str.c mod-str.h mod-sys.c mod-sys.h imap-imp.h mod-math.c mod-math.h mod-str.c mod-str.h mod-sys.c \
mod-sys.h
am__objects_1 = am__objects_1 =
am__objects_2 = $(am__objects_1) am__objects_2 = $(am__objects_1)
@ENABLE_STATIC_MODULE_TRUE@am__objects_3 = libhawk_la-mod-math.lo \ @ENABLE_CXX_TRUE@am__objects_3 = libhawk_la-Hawk.lo \
@ENABLE_CXX_TRUE@ libhawk_la-HawkStd.lo
@ENABLE_STATIC_MODULE_TRUE@am__objects_4 = libhawk_la-mod-math.lo \
@ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-str.lo \ @ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-str.lo \
@ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-sys.lo @ENABLE_STATIC_MODULE_TRUE@ libhawk_la-mod-sys.lo
am_libhawk_la_OBJECTS = $(am__objects_2) libhawk_la-arr.lo \ am_libhawk_la_OBJECTS = $(am__objects_2) libhawk_la-arr.lo \
@ -240,19 +243,12 @@ am_libhawk_la_OBJECTS = $(am__objects_2) libhawk_la-arr.lo \
libhawk_la-utl-str.lo libhawk_la-utl-sys.lo libhawk_la-utl.lo \ libhawk_la-utl-str.lo libhawk_la-utl-sys.lo libhawk_la-utl.lo \
libhawk_la-val.lo libhawk_la-cli.lo libhawk_la-fio.lo \ libhawk_la-val.lo libhawk_la-cli.lo libhawk_la-fio.lo \
libhawk_la-mtx.lo libhawk_la-pio.lo libhawk_la-sio.lo \ libhawk_la-mtx.lo libhawk_la-pio.lo libhawk_la-sio.lo \
libhawk_la-tio.lo libhawk_la-std.lo $(am__objects_3) libhawk_la-tio.lo libhawk_la-std.lo $(am__objects_3) \
$(am__objects_4)
libhawk_la_OBJECTS = $(am_libhawk_la_OBJECTS) libhawk_la_OBJECTS = $(am_libhawk_la_OBJECTS)
libhawk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ libhawk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libhawk_la_LDFLAGS) $(LDFLAGS) -o $@
am__libhawkxx_la_SOURCES_DIST = Hawk.cpp HawkStd.cpp
@ENABLE_CXX_TRUE@am_libhawkxx_la_OBJECTS = libhawkxx_la-Hawk.lo \
@ENABLE_CXX_TRUE@ libhawkxx_la-HawkStd.lo
libhawkxx_la_OBJECTS = $(am_libhawkxx_la_OBJECTS)
libhawkxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libhawkxx_la_LDFLAGS) $(LDFLAGS) -o $@ $(CXXFLAGS) $(libhawk_la_LDFLAGS) $(LDFLAGS) -o $@
@ENABLE_CXX_TRUE@am_libhawkxx_la_rpath = -rpath $(pkglibdir)
AM_V_P = $(am__v_P_@AM_V@) AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false am__v_P_0 = false
@ -268,9 +264,11 @@ am__v_at_1 =
DEFAULT_INCLUDES = DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__maybe_remake_depfiles = depfiles am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/libhawk_la-arr.Plo \ am__depfiles_remade = ./$(DEPDIR)/libhawk_la-Hawk.Plo \
./$(DEPDIR)/libhawk_la-chr.Plo ./$(DEPDIR)/libhawk_la-cli.Plo \ ./$(DEPDIR)/libhawk_la-HawkStd.Plo \
./$(DEPDIR)/libhawk_la-dir.Plo ./$(DEPDIR)/libhawk_la-ecs.Plo \ ./$(DEPDIR)/libhawk_la-arr.Plo ./$(DEPDIR)/libhawk_la-chr.Plo \
./$(DEPDIR)/libhawk_la-cli.Plo ./$(DEPDIR)/libhawk_la-dir.Plo \
./$(DEPDIR)/libhawk_la-ecs.Plo \
./$(DEPDIR)/libhawk_la-err-sys.Plo \ ./$(DEPDIR)/libhawk_la-err-sys.Plo \
./$(DEPDIR)/libhawk_la-err.Plo ./$(DEPDIR)/libhawk_la-fio.Plo \ ./$(DEPDIR)/libhawk_la-err.Plo ./$(DEPDIR)/libhawk_la-fio.Plo \
./$(DEPDIR)/libhawk_la-fmt.Plo ./$(DEPDIR)/libhawk_la-fnc.Plo \ ./$(DEPDIR)/libhawk_la-fmt.Plo ./$(DEPDIR)/libhawk_la-fnc.Plo \
@ -307,9 +305,7 @@ am__depfiles_remade = ./$(DEPDIR)/libhawk_la-arr.Plo \
./$(DEPDIR)/libhawk_la-utl.Plo ./$(DEPDIR)/libhawk_la-val.Plo \ ./$(DEPDIR)/libhawk_la-utl.Plo ./$(DEPDIR)/libhawk_la-val.Plo \
./$(DEPDIR)/libhawk_math_la-mod-math.Plo \ ./$(DEPDIR)/libhawk_math_la-mod-math.Plo \
./$(DEPDIR)/libhawk_str_la-mod-str.Plo \ ./$(DEPDIR)/libhawk_str_la-mod-str.Plo \
./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo \ ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo
./$(DEPDIR)/libhawkxx_la-Hawk.Plo \
./$(DEPDIR)/libhawkxx_la-HawkStd.Plo
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -348,13 +344,11 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 = am__v_CXXLD_1 =
SOURCES = $(libhawk_math_la_SOURCES) $(libhawk_str_la_SOURCES) \ SOURCES = $(libhawk_math_la_SOURCES) $(libhawk_str_la_SOURCES) \
$(libhawk_sys_la_SOURCES) $(libhawk_la_SOURCES) \ $(libhawk_sys_la_SOURCES) $(libhawk_la_SOURCES)
$(libhawkxx_la_SOURCES)
DIST_SOURCES = $(am__libhawk_math_la_SOURCES_DIST) \ DIST_SOURCES = $(am__libhawk_math_la_SOURCES_DIST) \
$(am__libhawk_str_la_SOURCES_DIST) \ $(am__libhawk_str_la_SOURCES_DIST) \
$(am__libhawk_sys_la_SOURCES_DIST) \ $(am__libhawk_sys_la_SOURCES_DIST) \
$(am__libhawk_la_SOURCES_DIST) \ $(am__libhawk_la_SOURCES_DIST)
$(am__libhawkxx_la_SOURCES_DIST)
am__can_run_installinfo = \ am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \ case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \ n|no|NO) false;; \
@ -558,6 +552,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc AUTOMAKE_OPTIONS = nostdinc
AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
CPPFLAGS_ALL_COMMON = \ CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \ -I$(abs_builddir) \
-I$(abs_srcdir) \ -I$(abs_srcdir) \
@ -571,7 +566,7 @@ CPPFLAGS_ALL_COMMON = \
################################################## ##################################################
CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON)
LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
LIBADD_LIB_COMMON = $(LIBM) LIBADD_LIB_COMMON = $(LIBM) $(PTHREAD_LIBS)
DEPENDENCIES_LIB_COMMON = DEPENDENCIES_LIB_COMMON =
@WIN32_FALSE@CPPFLAGS_PFMOD = \ @WIN32_FALSE@CPPFLAGS_PFMOD = \
@WIN32_FALSE@ -DHAWK_DEFAULT_MODPREFIX=\"$(libdir)/libhawk-\" \ @WIN32_FALSE@ -DHAWK_DEFAULT_MODPREFIX=\"$(libdir)/libhawk-\" \
@ -586,7 +581,7 @@ pkginclude_HEADERS = hawk.h hawk-chr.h hawk-cmn.h hawk-dir.h \
hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h hawk-rbt.h \ hawk-ecs.h hawk-fmt.h hawk-gem.h hawk-htb.h hawk-rbt.h \
hawk-pack1.h hawk-utl.h hawk-std.h hawk-tre.h hawk-unpack.h \ hawk-pack1.h hawk-utl.h hawk-std.h hawk-tre.h hawk-unpack.h \
$(am__append_7) $(am__append_7)
pkglib_LTLIBRARIES = libhawk.la $(am__append_8) $(am__append_15) pkglib_LTLIBRARIES = libhawk.la $(am__append_15)
libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \ libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \
ecs.c err-prv.h err.c err-sys.c fmt-imp.h fmt.c fnc-prv.h \ ecs.c err-prv.h err.c err-sys.c fmt-imp.h fmt.c fnc-prv.h \
fnc.c htb.c gem.c gem-skad.c gem-nwif.c gem-nwif2.c hawk-prv.h \ fnc.c htb.c gem.c gem-skad.c gem-nwif.c gem-nwif2.c hawk-prv.h \
@ -598,7 +593,8 @@ libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \
utl-ass.c utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c \ utl-ass.c utl-skad.c utl-skad.h utl-sort.c utl-str.c utl-sys.c \
utl.c val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h \ utl.c val-prv.h val.c hawk-cli.h hawk-fio.h hawk-mtx.h \
hawk-pio.h hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c \ hawk-pio.h hawk-sio.h hawk-tio.h cli.c fio.c mtx.c pio.c sio.c \
syscall.h tio.c std-prv.h std.c $(am__append_9) syscall.h tio.c std-prv.h std.c $(am__append_8) \
$(am__append_9)
libhawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) $(am__append_3) libhawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) $(am__append_3)
libhawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) libhawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_4) \ libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_4) \
@ -606,11 +602,6 @@ libhawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_4) \
$(am__append_11) $(am__append_13) $(am__append_11) $(am__append_13)
libhawk_la_DEPENDENCIES = $(DEPENDENCIES_LIB_COMMON) $(am__append_12) \ libhawk_la_DEPENDENCIES = $(DEPENDENCIES_LIB_COMMON) $(am__append_12) \
$(am__append_14) $(am__append_14)
@ENABLE_CXX_TRUE@libhawkxx_la_SOURCES = Hawk.cpp HawkStd.cpp
@ENABLE_CXX_TRUE@libhawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
@ENABLE_CXX_TRUE@libhawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
@ENABLE_CXX_TRUE@libhawkxx_la_LIBADD = -lhawk $(LIBADD_LIB_COMMON)
@ENABLE_CXX_TRUE@libhawkxx_la_DEPENDENCIES = libhawk.la
################################################## ##################################################
# DYNAMIC MODULES # DYNAMIC MODULES
@ -729,10 +720,7 @@ libhawk-sys.la: $(libhawk_sys_la_OBJECTS) $(libhawk_sys_la_DEPENDENCIES) $(EXTRA
$(AM_V_CCLD)$(libhawk_sys_la_LINK) $(am_libhawk_sys_la_rpath) $(libhawk_sys_la_OBJECTS) $(libhawk_sys_la_LIBADD) $(LIBS) $(AM_V_CCLD)$(libhawk_sys_la_LINK) $(am_libhawk_sys_la_rpath) $(libhawk_sys_la_OBJECTS) $(libhawk_sys_la_LIBADD) $(LIBS)
libhawk.la: $(libhawk_la_OBJECTS) $(libhawk_la_DEPENDENCIES) $(EXTRA_libhawk_la_DEPENDENCIES) libhawk.la: $(libhawk_la_OBJECTS) $(libhawk_la_DEPENDENCIES) $(EXTRA_libhawk_la_DEPENDENCIES)
$(AM_V_CCLD)$(libhawk_la_LINK) -rpath $(pkglibdir) $(libhawk_la_OBJECTS) $(libhawk_la_LIBADD) $(LIBS) $(AM_V_CXXLD)$(libhawk_la_LINK) -rpath $(pkglibdir) $(libhawk_la_OBJECTS) $(libhawk_la_LIBADD) $(LIBS)
libhawkxx.la: $(libhawkxx_la_OBJECTS) $(libhawkxx_la_DEPENDENCIES) $(EXTRA_libhawkxx_la_DEPENDENCIES)
$(AM_V_CXXLD)$(libhawkxx_la_LINK) $(am_libhawkxx_la_rpath) $(libhawkxx_la_OBJECTS) $(libhawkxx_la_LIBADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -740,6 +728,8 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-Hawk.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-HawkStd.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-arr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-arr.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-chr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-chr.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-cli.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_la-cli.Plo@am__quote@ # am--include-marker
@ -792,8 +782,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_math_la-mod-math.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_math_la-mod-math.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_str_la-mod-str.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_str_la-mod-str.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-Hawk.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhawkxx_la-HawkStd.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade): $(am__depfiles_remade):
@$(MKDIR_P) $(@D) @$(MKDIR_P) $(@D)
@ -1213,19 +1201,19 @@ libhawk_la-mod-sys.lo: mod-sys.c
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
libhawkxx_la-Hawk.lo: Hawk.cpp libhawk_la-Hawk.lo: Hawk.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawkxx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhawkxx_la-Hawk.lo -MD -MP -MF $(DEPDIR)/libhawkxx_la-Hawk.Tpo -c -o libhawkxx_la-Hawk.lo `test -f 'Hawk.cpp' || echo '$(srcdir)/'`Hawk.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhawk_la-Hawk.lo -MD -MP -MF $(DEPDIR)/libhawk_la-Hawk.Tpo -c -o libhawk_la-Hawk.lo `test -f 'Hawk.cpp' || echo '$(srcdir)/'`Hawk.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawkxx_la-Hawk.Tpo $(DEPDIR)/libhawkxx_la-Hawk.Plo @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_la-Hawk.Tpo $(DEPDIR)/libhawk_la-Hawk.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Hawk.cpp' object='libhawkxx_la-Hawk.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Hawk.cpp' object='libhawk_la-Hawk.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawkxx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhawkxx_la-Hawk.lo `test -f 'Hawk.cpp' || echo '$(srcdir)/'`Hawk.cpp @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhawk_la-Hawk.lo `test -f 'Hawk.cpp' || echo '$(srcdir)/'`Hawk.cpp
libhawkxx_la-HawkStd.lo: HawkStd.cpp libhawk_la-HawkStd.lo: HawkStd.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawkxx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhawkxx_la-HawkStd.lo -MD -MP -MF $(DEPDIR)/libhawkxx_la-HawkStd.Tpo -c -o libhawkxx_la-HawkStd.lo `test -f 'HawkStd.cpp' || echo '$(srcdir)/'`HawkStd.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libhawk_la-HawkStd.lo -MD -MP -MF $(DEPDIR)/libhawk_la-HawkStd.Tpo -c -o libhawk_la-HawkStd.lo `test -f 'HawkStd.cpp' || echo '$(srcdir)/'`HawkStd.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawkxx_la-HawkStd.Tpo $(DEPDIR)/libhawkxx_la-HawkStd.Plo @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_la-HawkStd.Tpo $(DEPDIR)/libhawk_la-HawkStd.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HawkStd.cpp' object='libhawkxx_la-HawkStd.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='HawkStd.cpp' object='libhawk_la-HawkStd.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawkxx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhawkxx_la-HawkStd.lo `test -f 'HawkStd.cpp' || echo '$(srcdir)/'`HawkStd.cpp @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libhawk_la-HawkStd.lo `test -f 'HawkStd.cpp' || echo '$(srcdir)/'`HawkStd.cpp
mostlyclean-libtool: mostlyclean-libtool:
-rm -f *.lo -rm -f *.lo
@ -1382,7 +1370,9 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
mostlyclean-am mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f ./$(DEPDIR)/libhawk_la-arr.Plo -rm -f ./$(DEPDIR)/libhawk_la-Hawk.Plo
-rm -f ./$(DEPDIR)/libhawk_la-HawkStd.Plo
-rm -f ./$(DEPDIR)/libhawk_la-arr.Plo
-rm -f ./$(DEPDIR)/libhawk_la-chr.Plo -rm -f ./$(DEPDIR)/libhawk_la-chr.Plo
-rm -f ./$(DEPDIR)/libhawk_la-cli.Plo -rm -f ./$(DEPDIR)/libhawk_la-cli.Plo
-rm -f ./$(DEPDIR)/libhawk_la-dir.Plo -rm -f ./$(DEPDIR)/libhawk_la-dir.Plo
@ -1434,8 +1424,6 @@ distclean: distclean-am
-rm -f ./$(DEPDIR)/libhawk_math_la-mod-math.Plo -rm -f ./$(DEPDIR)/libhawk_math_la-mod-math.Plo
-rm -f ./$(DEPDIR)/libhawk_str_la-mod-str.Plo -rm -f ./$(DEPDIR)/libhawk_str_la-mod-str.Plo
-rm -f ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo -rm -f ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo
-rm -f ./$(DEPDIR)/libhawkxx_la-Hawk.Plo
-rm -f ./$(DEPDIR)/libhawkxx_la-HawkStd.Plo
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \ distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags distclean-hdr distclean-tags
@ -1482,7 +1470,9 @@ install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/libhawk_la-arr.Plo -rm -f ./$(DEPDIR)/libhawk_la-Hawk.Plo
-rm -f ./$(DEPDIR)/libhawk_la-HawkStd.Plo
-rm -f ./$(DEPDIR)/libhawk_la-arr.Plo
-rm -f ./$(DEPDIR)/libhawk_la-chr.Plo -rm -f ./$(DEPDIR)/libhawk_la-chr.Plo
-rm -f ./$(DEPDIR)/libhawk_la-cli.Plo -rm -f ./$(DEPDIR)/libhawk_la-cli.Plo
-rm -f ./$(DEPDIR)/libhawk_la-dir.Plo -rm -f ./$(DEPDIR)/libhawk_la-dir.Plo
@ -1534,8 +1524,6 @@ maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/libhawk_math_la-mod-math.Plo -rm -f ./$(DEPDIR)/libhawk_math_la-mod-math.Plo
-rm -f ./$(DEPDIR)/libhawk_str_la-mod-str.Plo -rm -f ./$(DEPDIR)/libhawk_str_la-mod-str.Plo
-rm -f ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo -rm -f ./$(DEPDIR)/libhawk_sys_la-mod-sys.Plo
-rm -f ./$(DEPDIR)/libhawkxx_la-Hawk.Plo
-rm -f ./$(DEPDIR)/libhawkxx_la-HawkStd.Plo
-rm -f Makefile -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-am: distclean-am maintainer-clean-generic

4
hawk/lib/arr.c
View File

@ -581,7 +581,7 @@ void hawk_arr_popstack (hawk_arr_t* arr)
*(hawk_oow_t*)((hawk_uint8_t*)DPTR(arr->slot[index]) + arr->heap_pos_offset) = index; \ *(hawk_oow_t*)((hawk_uint8_t*)DPTR(arr->slot[index]) + arr->heap_pos_offset) = index; \
} while(0) } while(0)
hawk_oow_t sift_up (hawk_arr_t* arr, hawk_oow_t index) static hawk_oow_t sift_up (hawk_arr_t* arr, hawk_oow_t index)
{ {
hawk_oow_t parent; hawk_oow_t parent;
@ -622,7 +622,7 @@ hawk_oow_t sift_up (hawk_arr_t* arr, hawk_oow_t index)
return index; return index;
} }
hawk_oow_t sift_down (hawk_arr_t* arr, hawk_oow_t index) static hawk_oow_t sift_down (hawk_arr_t* arr, hawk_oow_t index)
{ {
hawk_oow_t base; hawk_oow_t base;

7
hawk/samples/Makefile.am
View File

@ -1,5 +1,8 @@
AUTOMAKE_OPTIONS = nostdinc AUTOMAKE_OPTIONS = nostdinc
AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
CPPFLAGS_ALL_COMMON = \ CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \ -I$(abs_builddir) \
-I$(abs_builddir)/../lib \ -I$(abs_builddir)/../lib \
@ -25,7 +28,7 @@ bin_PROGRAMS += hawk51
hawk51_SOURCES = hawk51.cpp hawk51_SOURCES = hawk51.cpp
hawk51_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) hawk51_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
hawk51_LDFLAGS = $(LDFLAGS_ALL_COMMON) hawk51_LDFLAGS = $(LDFLAGS_ALL_COMMON)
hawk51_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawkxx hawk51_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawk
hawk51_DEPENDENCIES = ../lib/libhawkxx.la hawk51_DEPENDENCIES = ../lib/libhawk.la
endif endif

6
hawk/samples/Makefile.in
View File

@ -344,6 +344,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = nostdinc AUTOMAKE_OPTIONS = nostdinc
AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
CPPFLAGS_ALL_COMMON = \ CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \ -I$(abs_builddir) \
-I$(abs_builddir)/../lib \ -I$(abs_builddir)/../lib \
@ -358,8 +360,8 @@ LIBADD_BIN_COMMON = $(LIBM)
@ENABLE_CXX_TRUE@hawk51_SOURCES = hawk51.cpp @ENABLE_CXX_TRUE@hawk51_SOURCES = hawk51.cpp
@ENABLE_CXX_TRUE@hawk51_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) @ENABLE_CXX_TRUE@hawk51_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
@ENABLE_CXX_TRUE@hawk51_LDFLAGS = $(LDFLAGS_ALL_COMMON) @ENABLE_CXX_TRUE@hawk51_LDFLAGS = $(LDFLAGS_ALL_COMMON)
@ENABLE_CXX_TRUE@hawk51_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawkxx @ENABLE_CXX_TRUE@hawk51_LDADD = $(LIBADD_BIN_COMMON) $(SOCKET_LIBS) -lhawk
@ENABLE_CXX_TRUE@hawk51_DEPENDENCIES = ../lib/libhawkxx.la @ENABLE_CXX_TRUE@hawk51_DEPENDENCIES = ../lib/libhawk.la
all: all-am all: all-am
.SUFFIXES: .SUFFIXES: