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

simplified build files

Browse Source
This commit is contained in:
hyunghwan.chung
2016-05-07 02:41:29 +00:00
parent 4bbd5b52bb
commit 197ceb3a76
6 changed files with 60 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stix/Makefile.am
View File

@ -7,4 +7,4 @@ SUBDIRS = libltdl lib
DIST_SUBDIRS = $(SUBDIRS)
distclean-local:
$(RM) -r $(top_srcdir)/autom4te.cache
@rm -rf $(top_srcdir)/autom4te.cache

6
stix/Makefile.in
View File

@ -222,7 +222,6 @@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@ -280,8 +279,6 @@ PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@
PATH_SEPARATOR = @PATH_SEPARATOR@
QUADMATH_LIBS = @QUADMATH_LIBS@
RANLIB = @RANLIB@
RM = @RM@
RMDIR = @RMDIR@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@ -300,7 +297,6 @@ STIX_SIZEOF_SHORT = @STIX_SIZEOF_SHORT@
STIX_SIZEOF_VOID_P = @STIX_SIZEOF_VOID_P@
STIX_SIZEOF_WCHAR_T = @STIX_SIZEOF_WCHAR_T@
STRIP = @STRIP@
TRUE = @TRUE@
UNICOWS_LIBS = @UNICOWS_LIBS@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
@ -832,7 +828,7 @@ uninstall-am:
distclean-local:
$(RM) -r $(top_srcdir)/autom4te.cache
@rm -rf $(top_srcdir)/autom4te.cache
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

412
stix/configure vendored
View File

@ -705,7 +705,6 @@ ac_ct_DUMPBIN
DUMPBIN
LD
FGREP
SED
host_os
host_vendor
host_cpu
@ -715,10 +714,7 @@ build_vendor
build_cpu
build
LIBTOOL
ECHO
TRUE
RMDIR
RM
SED
LN_S
EGREP
GREP
@ -5906,377 +5902,75 @@ else
$as_echo "no, using $LN_S" >&6; }
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}rm", so it can be a program name with args.
set dummy ${ac_tool_prefix}rm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_RM+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RM"; then
ac_cv_prog_RM="$RM" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
{ ac_script=; unset ac_script;}
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RM="${ac_tool_prefix}rm"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
*GNU*)
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
*)
ac_count=0
$as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
as_fn_arith $ac_count + 1 && ac_count=$as_val
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
ac_path_SED_max=$ac_count
fi
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
IFS=$as_save_IFS
fi
fi
RM=$ac_cv_prog_RM
if test -n "$RM"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
$as_echo "$RM" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_prog_RM"; then
ac_ct_RM=$RM
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_ac_ct_RM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RM"; then
ac_cv_prog_ac_ct_RM="$ac_ct_RM" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RM="rm"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_RM=$ac_cv_prog_ac_ct_RM
if test -n "$ac_ct_RM"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RM" >&5
$as_echo "$ac_ct_RM" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_ct_RM" = x; then
RM=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
RM=$ac_ct_RM
fi
else
RM="$ac_cv_prog_RM"
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}rmdir", so it can be a program name with args.
set dummy ${ac_tool_prefix}rmdir; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_RMDIR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RMDIR"; then
ac_cv_prog_RMDIR="$RMDIR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RMDIR="${ac_tool_prefix}rmdir"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
$ac_path_SED_found && break 3
done
done
done
IFS=$as_save_IFS
fi
fi
RMDIR=$ac_cv_prog_RMDIR
if test -n "$RMDIR"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5
$as_echo "$RMDIR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_prog_RMDIR"; then
ac_ct_RMDIR=$RMDIR
# Extract the first word of "rmdir", so it can be a program name with args.
set dummy rmdir; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_ac_ct_RMDIR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RMDIR"; then
ac_cv_prog_ac_ct_RMDIR="$ac_ct_RMDIR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RMDIR="rmdir"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_RMDIR=$ac_cv_prog_ac_ct_RMDIR
if test -n "$ac_ct_RMDIR"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RMDIR" >&5
$as_echo "$ac_ct_RMDIR" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_ct_RMDIR" = x; then
RMDIR=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RMDIR=$ac_ct_RMDIR
if test -z "$ac_cv_path_SED"; then
as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
RMDIR="$ac_cv_prog_RMDIR"
ac_cv_path_SED=$SED
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}true", so it can be a program name with args.
set dummy ${ac_tool_prefix}true; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_TRUE+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$TRUE"; then
ac_cv_prog_TRUE="$TRUE" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_TRUE="${ac_tool_prefix}true"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
fi
fi
TRUE=$ac_cv_prog_TRUE
if test -n "$TRUE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TRUE" >&5
$as_echo "$TRUE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_prog_TRUE"; then
ac_ct_TRUE=$TRUE
# Extract the first word of "true", so it can be a program name with args.
set dummy true; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_ac_ct_TRUE+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_TRUE"; then
ac_cv_prog_ac_ct_TRUE="$ac_ct_TRUE" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_TRUE="true"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_TRUE=$ac_cv_prog_ac_ct_TRUE
if test -n "$ac_ct_TRUE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_TRUE" >&5
$as_echo "$ac_ct_TRUE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_ct_TRUE" = x; then
TRUE=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
TRUE=$ac_ct_TRUE
fi
else
TRUE="$ac_cv_prog_TRUE"
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}echo", so it can be a program name with args.
set dummy ${ac_tool_prefix}echo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_ECHO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ECHO"; then
ac_cv_prog_ECHO="$ECHO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ECHO="${ac_tool_prefix}echo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ECHO=$ac_cv_prog_ECHO
if test -n "$ECHO"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ECHO" >&5
$as_echo "$ECHO" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_prog_ECHO"; then
ac_ct_ECHO=$ECHO
# Extract the first word of "echo", so it can be a program name with args.
set dummy echo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_ac_ct_ECHO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_ECHO"; then
ac_cv_prog_ac_ct_ECHO="$ac_ct_ECHO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_ECHO="echo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
ac_ct_ECHO=$ac_cv_prog_ac_ct_ECHO
if test -n "$ac_ct_ECHO"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ECHO" >&5
$as_echo "$ac_ct_ECHO" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_ct_ECHO" = x; then
ECHO=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
ECHO=$ac_ct_ECHO
fi
else
ECHO="$ac_cv_prog_ECHO"
fi
RM="$RM -f"

10
stix/configure.ac
View File

@ -33,15 +33,7 @@ dnl determine some key programs
AC_PROG_INSTALL
AC_PROG_EGREP
AC_PROG_LN_S
dnl check other tools
AC_CHECK_TOOL(RM, rm)
AC_CHECK_TOOL(RMDIR, rmdir)
AC_CHECK_TOOL(TRUE, true)
AC_CHECK_TOOL(ECHO, echo)
dnl avoid "'/bin/rm: cannot remove `libtoolT': No such file or directory"
RM="$RM -f"
AC_PROG_SED
dnl 'recursive' type seems to have problems in setting LT_CONFIG_H
dnl so i use the classic 'subproject' type here

4
stix/lib/Makefile.am
View File

@ -95,9 +95,9 @@ install-data-hook:
@echo "#define _STIX_CFG_H_" >> "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@$(EGREP) "#define[ ]+STIX_" "$(abs_builddir)/stix-cfg.h" >> "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@echo "#endif" >> "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@$(RM) "$(DESTDIR)$(pkgincludedir)/stix-cfg.h.in"
@rm -f "$(DESTDIR)$(pkgincludedir)/stix-cfg.h.in"
@$(SED) 's|/\*#define STIX_HAVE_CFG_H\*/|#define STIX_HAVE_CFG_H|' "$(srcdir)/stix-cmn.h" > "$(DESTDIR)$(pkgincludedir)/stix-cmn.h"
uninstall-hook:
@$(RM) "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@rm -f "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"

8
stix/lib/Makefile.in
View File

@ -260,7 +260,6 @@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@ -318,8 +317,6 @@ PACKAGE_VERSION_PATCH = @PACKAGE_VERSION_PATCH@
PATH_SEPARATOR = @PATH_SEPARATOR@
QUADMATH_LIBS = @QUADMATH_LIBS@
RANLIB = @RANLIB@
RM = @RM@
RMDIR = @RMDIR@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@ -338,7 +335,6 @@ STIX_SIZEOF_SHORT = @STIX_SIZEOF_SHORT@
STIX_SIZEOF_VOID_P = @STIX_SIZEOF_VOID_P@
STIX_SIZEOF_WCHAR_T = @STIX_SIZEOF_WCHAR_T@
STRIP = @STRIP@
TRUE = @TRUE@
UNICOWS_LIBS = @UNICOWS_LIBS@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
@ -1070,11 +1066,11 @@ install-data-hook:
@echo "#define _STIX_CFG_H_" >> "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@$(EGREP) "#define[ ]+STIX_" "$(abs_builddir)/stix-cfg.h" >> "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@echo "#endif" >> "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@$(RM) "$(DESTDIR)$(pkgincludedir)/stix-cfg.h.in"
@rm -f "$(DESTDIR)$(pkgincludedir)/stix-cfg.h.in"
@$(SED) 's|/\*#define STIX_HAVE_CFG_H\*/|#define STIX_HAVE_CFG_H|' "$(srcdir)/stix-cmn.h" > "$(DESTDIR)$(pkgincludedir)/stix-cmn.h"
uninstall-hook:
@$(RM) "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
@rm -f "$(DESTDIR)$(pkgincludedir)/stix-cfg.h"
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.