cleaned up build files

This commit is contained in:
2020-11-15 09:56:06 +00:00
parent 966888844b
commit 0823ddc2d0
16 changed files with 1735 additions and 1555 deletions

View File

@ -3,8 +3,7 @@ AUTOMAKE_OPTIONS = nostdinc
CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \
-I$(abs_srcdir) \
-I$(includedir) \
$(PTHREAD_CFLAGS)
-I$(includedir)
if ENABLE_STATIC_MODULE
LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir)
@ -112,7 +111,7 @@ libhclx_la_SOURCES = \
hcl-c.c hcl-c.h
libhclx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) $(CPPFLAGS_PFMOD)
libhclx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libhclx_la_LIBADD = -lhcl $(LIBADD_LIB_COMMON) $(PTHREAD_LIBS)
libhclx_la_LIBADD = -lhcl $(LIBADD_LIB_COMMON)
libhclx_la_DEPENDENCIES = libhcl.la
endif

View File

@ -388,6 +388,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@ -400,8 +401,7 @@ AUTOMAKE_OPTIONS = nostdinc
CPPFLAGS_ALL_COMMON = \
-I$(abs_builddir) \
-I$(abs_srcdir) \
-I$(includedir) \
$(PTHREAD_CFLAGS)
-I$(includedir)
@ENABLE_STATIC_MODULE_FALSE@LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(libdir)
@ENABLE_STATIC_MODULE_TRUE@LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir)
@ -469,7 +469,7 @@ libhcl_la_DEPENDENCIES = $(am__append_7)
@ENABLE_HCLX_TRUE@libhclx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) $(CPPFLAGS_PFMOD)
@ENABLE_HCLX_TRUE@libhclx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
@ENABLE_HCLX_TRUE@libhclx_la_LIBADD = -lhcl $(LIBADD_LIB_COMMON) $(PTHREAD_LIBS)
@ENABLE_HCLX_TRUE@libhclx_la_LIBADD = -lhcl $(LIBADD_LIB_COMMON)
@ENABLE_HCLX_TRUE@libhclx_la_DEPENDENCIES = libhcl.la
all: hcl-cfg.h
$(MAKE) $(AM_MAKEFLAGS) all-am

View File

@ -322,7 +322,7 @@ hcl_errnum_t hcl_vmprim_syserrstrb (hcl_t* hcl, int syserr_type, int syserr_code
#if defined(HCL_BUILD_RELEASE)
void hcl_cb_assertfail (hcl_t* hcl, const hcl_bch_t* expr, const hcl_bch_t* file, hcl_oow_t line)
void hcl_vmprim_assertfail (hcl_t* hcl, const hcl_bch_t* expr, const hcl_bch_t* file, hcl_oow_t line)
{
/* do nothing */
}

View File

@ -125,7 +125,7 @@ static HCL_INLINE const char* proc_state_to_string (int state)
# define LOG_INST_1(hcl,fmt,a1)
# define LOG_INST_2(hcl,fmt,a1,a2)
# define LOG_INST_3(hcl,fmt,a1,a2,a3)
# define LOG_INST_3(hcl,fmt,a1,a2,a3,a4)
# define LOG_INST_4(hcl,fmt,a1,a2,a3,a4)
#endif
static int delete_sem_from_sem_io_tuple (hcl_t* hcl, hcl_oop_semaphore_t sem, int force);