You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2001/03/24 05:15:45 UTC
cvs commit: apr-iconv/util Makefile.in
wrowe 01/03/23 20:15:45
Added: . Makefile.in buildconf.sh configure.in
build apr-iconv.m4 rules.mk.in
ccs Makefile.in
ces Makefile.in
lib Makefile.in
util Makefile.in
Log:
*) A first blush at a working build system.
[jean-frederic clere <jf...@fujitsu-siemens.com>]
Revision Changes Path
1.1 apr-iconv/Makefile.in
Index: Makefile.in
===================================================================
#
# Top-level Makefile for APRICONV
#
TARGET_LIB = libapriconv.la
TARGET_EXPORTS = apriconv.exports
TARGETS = delete-lib $(TARGET_LIB) delete-exports $(TARGET_EXPORTS)
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
SUBDIRS = lib ccs ces util
CLEAN_SUBDIRS = . lib ccs ces util
CLEAN_TARGETS = $(TARGET_EXPORTS)
DISTCLEAN_TARGETS = config.cache config.log config.status \
export_vars.sh
EXTRACLEAN_TARGETS = configure libtool aclocal.m4
### fix this up at some point (install location)
libdir = /usr/local/lib
delete-lib:
@if test -f $(TARGET_LIB); then \
objects="`find $(SUBDIRS) -name '*.lo' -a -newer $(TARGET_LIB)`" ; \
if test -n "$$objects"; then \
echo Found newer objects. Will relink $(TARGET_LIB). ; \
echo $(RM) -f $(TARGET_LIB) ; \
$(RM) -f $(TARGET_LIB) ; \
fi \
fi
$(TARGET_LIB):
@objects="`find $(SUBDIRS) -name '*.lo'`" ; \
echo $(LINK) $$objects ; \
$(LINK) -rpath $(libdir) $$objects
delete-exports:
@if test -f $(TARGET_EXPORTS); then \
headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
if test -n "$$headers"; then \
echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
echo $(RM) -f $(TARGET_EXPORTS) ; \
$(RM) -f $(TARGET_EXPORTS) ; \
fi \
fi
$(TARGET_EXPORTS):
$(AWK) -f @APR_SOURCE_DIR@/build/make_export.awk include/*.h > $@ ;
docs:
mkdir ./docs
perl @APR_SOURCE_DIR@/build/scandoc.pl -i./build/default.pl -p./docs/ ./include/*.h
.PHONY: delete-lib delete-exports
1.1 apr-iconv/buildconf.sh
Index: buildconf.sh
===================================================================
#!/bin/sh
#
# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
#
### we may need to get smarter with these two lines (e.g. PrintPath)
ltpath=`../apr/build/PrintPath libtoolize`
ltpath=`dirname $ltpath`
ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
echo "Incorporating $ltfile into aclocal.m4 ..."
echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
echo "dnl edits here will be lost" >> aclocal.m4
cat build/apr-iconv.m4 >> aclocal.m4
cat $ltfile >> aclocal.m4
#
# Create the libtool helper files
#
# Note: we always replace the files, and we copy (rather than link) them.
#
echo "Copying libtool helper files ..."
$ltpath/libtoolize --force --copy
#
# Generate the autoconf header (include/apu_config.h) and ./configure
#
echo "Creating include/private/apu_config.h ..."
autoheader
echo "Creating configure ..."
### do some work to toss config.cache?
autoconf
1.1 apr-iconv/configure.in
Index: configure.in
===================================================================
dnl
dnl Process this file with autoconf to produce a configure script
dnl
AC_PREREQ(2.13)
AC_INIT(build/rules.mk.in)
AC_CONFIG_AUX_DIR(../apr/build)
AC_PROG_CC
AC_PROG_AWK
AC_CHECK_PROG(RM, rm, rm)
dnl
dnl compute the top directory of the build
dnl note: this is needed for LIBTOOL
dnl
top_builddir="`cd $srcdir ; pwd`"
AC_SUBST(top_builddir)
dnl check for APR
APU_FIND_APR
aprbuild=$APR_SOURCE_DIR/build
dnl
dnl set up the compilation flags and stuff
dnl
INCLUDES="$INCLUDES -I\$(top_builddir)/lib"
INCLUDES="$INCLUDES -I$APR_INCLUDES"
dnl
dnl prep libtool
dnl
echo "performing libtool configuration..."
AC_PROG_LIBTOOL
$SHELL $aprbuild/ltconfig --output=shlibtool --disable-static --srcdir=$aprbuild --cache-file=./config.cache $aprbuild/ltmain.sh
dnl
dnl grab flags from APR.
dnl ### APR doesn't have "nice" names for its exports (yet), but it isn't
dnl ### a problem to deal with them right here
dnl
. "$APR_SOURCE_DIR/APRVARS"
APR_EXPORT_CPPFLAGS="$EXTRA_CPPFLAGS"
APR_EXPORT_CFLAGS="$EXTRA_CFLAGS"
APR_EXPORT_LIBS="$EXTRA_LIBS"
dnl
dnl Prep all the flags and stuff for compilation and export to other builds
dnl
CFLAGS="$CFLAGS $INCLUDES $APR_EXPORT_CFLAGS $APR_EXPORT_CPPFLAGS"
LIBS="$LIBS $APR_EXPORT_LIBS"
AC_SUBST(APRUTIL_EXPORT_LIBS)
dnl
dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
dnl
case "$host_alias" in
*bsdi*)
INCLUDE_RULES=".include \"$top_builddir/build/rules.mk\""
;;
*)
INCLUDE_RULES="include $top_builddir/build/rules.mk"
;;
esac
AC_SUBST(INCLUDE_RULES)
dnl
dnl everthing is done.
AC_OUTPUT([
Makefile
ccs/Makefile
ces/Makefile
lib/Makefile
util/Makefile
build/rules.mk
])
1.1 apr-iconv/build/apr-iconv.m4
Index: apr-iconv.m4
===================================================================
dnl
dnl custom autoconf rules for APRICONV
dnl
dnl
dnl APU_FIND_APR: figure out where APR is located
dnl that a copy from apr-util...
dnl
AC_DEFUN(APU_FIND_APR,[
AC_MSG_CHECKING(for APR)
AC_ARG_WITH(apr,
[ --with-apr=DIR path to APR source or the APR includes],
[
if test "$withval" = "yes"; then
AC_MSG_ERROR(You need to specify a directory with --with-apr)
fi
absdir="`cd $withval ; pwd`"
if test -f "$absdir/apr_pools.h"; then
APR_INCLUDES="$absdir"
elif test -f "$absdir/include/apr_pools.h"; then
APR_SOURCE_DIR="$absdir"
fi
],[
dnl see if we can find APR
if test -f "$srcdir/apr/include/apr_pools.h"; then
APR_SOURCE_DIR="$srcdir/apr"
elif test -f "$srcdir/../apr/include/apr_pools.h"; then
APR_SOURCE_DIR="`cd $srcdir/../apr ; pwd`"
fi
])
if test -n "$APR_SOURCE_DIR"; then
APR_INCLUDES="$APR_SOURCE_DIR/include"
fi
if test -z "$APR_INCLUDES"; then
AC_MSG_RESULT(not found)
AC_MSG_ERROR(APR could not be located. Please use the --with-apr option.)
fi
AC_MSG_RESULT($APR_INCLUDES)
AC_SUBST(APR_SOURCE_DIR)
])
1.1 apr-iconv/build/rules.mk.in
Index: rules.mk.in
===================================================================
# ====================================================================
# The Apache Software License, Version 1.1
#
# Copyright (c) 2000-2001 The Apache Software Foundation. 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.
#
# 3. The end-user documentation included with the redistribution,
# if any, must include the following acknowledgment:
# "This product includes software developed by the
# Apache Software Foundation (http://www.apache.org/)."
# Alternately, this acknowledgment may appear in the software itself,
# if and wherever such third-party acknowledgments normally appear.
#
# 4. The names "Apache" and "Apache Software Foundation" must
# not be used to endorse or promote products derived from this
# software without prior written permission. For written
# permission, please contact apache@apache.org.
#
# 5. Products derived from this software may not be called "Apache",
# nor may "Apache" appear in their name, without prior written
# permission of the Apache Software Foundation.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
# ITS 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.
# ====================================================================
#
# This software consists of voluntary contributions made by many
# individuals on behalf of the Apache Software Foundation. For more
# information on the Apache Software Foundation, please see
# <http://www.apache.org/>.
#
#
# rules.mk: standard rules for APRICONV
#
#
# Configuration variables
#
top_builddir=@top_builddir@
APR_SOURCE_DIR=@APR_SOURCE_DIR@
CC=@CC@
AWK=@AWK@
LIBTOOL=@LIBTOOL@
CFLAGS=@CFLAGS@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
RM=@RM@
SHELL=@SHELL@
### make LTFLAGS somewhat variable?
LTFLAGS = --silent
#
# Basic macro setup
#
COMPILE = $(CC) $(CFLAGS)
LT_COMPILE = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && touch $@
LINK = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@
SH_LIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent
SH_COMPILE = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
# To be arranged...
libexecdir = /usr/local/lib
MKEXPORT = $(AWK) -f $(APR_SOURCE_DIR)/build/make_export.awk
SCANDOC = $(APR_SOURCE_DIR)/build/scandoc.pl
#
# Standard build rules
#
all: all-recursive
depend: depend-recursive
clean: clean-recursive
distclean: distclean-recursive
extraclean: extraclean-recursive
install: all-recursive
all-recursive depend-recursive clean-recursive distclean-recursive \
extraclean-recursive:
@otarget=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; \
ttarget=`echo $otarget | sed s/.*clean.*/clean/`; \
if test x"$ttarget" = "xclean"; then \
list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
fi; \
for i in $$list; do \
if test -d "$$i"; then \
target="$$otarget"; \
echo "Making $$target in $$i"; \
if test "$$i" = "."; then \
made_local=yes; \
target="local-$$target"; \
fi; \
(cd $$i && $(MAKE) $$target) || exit 1; \
fi; \
done; \
if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
made_local=n/a; \
fi; \
if test -z "$$made_local"; then \
$(MAKE) "local-$$otarget" || exit 1; \
fi
local-clean:
$(RM) -f *.o *.lo *.a *.la *.so $(CLEAN_TARGETS) $(PROGRAMS)
$(RM) -rf .libs
local-distclean: local-clean
$(RM) -f Makefile $(DISTCLEAN_TARGETS)
local-extraclean: local-distclean
@if test -n "$(EXTRACLEAN_TARGETS)"; then \
echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \
$(RM) -f $(EXTRACLEAN_TARGETS) ; \
fi
local-all: $(TARGETS)
local-depend:
### need something here
#
# Implicit rules for creating outputs from input files
#
.SUFFIXES:
.SUFFIXES: .c .lo .o .la .slo
.c.o:
$(COMPILE) -c $<
.c.lo:
$(LT_COMPILE)
.c.slo:
$(SH_COMPILE)
.c.la:
$(MAKE) $*.slo
$(SH_LINK) -rpath $(libexecdir) -module -avoid-version $*.lo
.PHONY: all depend clean distclean extraclean install \
all-recursive depend-recursive clean-recursive distclean-recursive \
extraclean-recursive
local-all local-depend local-clean local-distclean local-extraclean
1.1 apr-iconv/ccs/Makefile.in
Index: Makefile.in
===================================================================
CHARSETS_ISO8859 = iso-8859-1.la iso-8859-2.la iso-8859-4.la iso-8859-5.la \
iso-8859-15.la
CHARSETS_PC = cp775.la cp850.la cp852.la cp855.la cp866.la
CHARSETS_KOI = koi8-r.la koi8-u.la
CHARSETS_SB = $(CHARSETS_ISO8859) $(CHARSETS_PC) $(CHARSETS_CJK) \
$(CHARSETS_KOI) us-ascii.la
CHARSETS_CJK = big5.la cns11643-plane1.la cns11643-plane2.la \
cns11643-plane14.la gb_2312-80.la jis_x0201.la \
jis_x0208-1983.la jis_x0212-1990.la ksx1001.la shift_jis.la
CHARSETS_ALL = ${CHARSETS_SB} ${CHARSETS_CJK}
EXTRA_ISO8859 = iso-8859-3.la iso-8859-6.la iso-8859-7.la iso-8859-8.la \
iso-8859-9.la iso-8859-10.la iso-8859-13.la iso-8859-14.la
EXTRA_KOI = koi8-ru.la
EXTRA_MISC = gb12345.la johab.la adobe-stdenc.la adobe-symbol.la \
adobe-zdingbats.la mac-ce.la mac-croatian.la mac-cyrillic.la \
mac-dingbats.la mac-greek.la mac-iceland.la mac-japan.la \
mac-roman.la mac-romania.la mac-thai.la mac-turkish.la \
mac-ukraine.la
EXTRA_PC = cp424.la cp500.la cp856.la cp1006.la cp437.la cp737.la cp857.la \
cp860.la cp861.la cp862.la cp863.la cp864.la cp865.la cp869.la \
cp874.la cp932.la cp936.la cp949.la cp950.la \
windows-1250.la windows-1251.la windows-1252.la windows-1253.la \
windows-1254.la windows-1255.la windows-1256.la windows-1257.la \
windows-1258.la cp037.la cp875.la cp1026.la \
cp10000.la cp10006.la cp10007.la cp10029.la cp10079.la cp10081.la
EXTRA_ALL = ${EXTRA_ISO8859} ${EXTRA_KOI} ${EXTRA_MISC} ${EXTRA_PC}
RFC1345_PC = cp851.la cp868.la cp038.la cp273.la cp274.la cp275.la cp277.la \
cp278.la cp280.la cp281.la cp284.la cp285.la cp290.la cp297.la \
cp420.la cp423.la cp870.la cp871.la cp880.la cp891.la \
cp903.la cp904.la cp905.la cp918.la
RFC1345_EBCDIC = ebcdic-at-de.la ebcdic-at-de-a.la ebcdic-ca-fr.la \
ebcdic-dk-no.la ebcdic-dk-no-a.la ebcdic-es.la ebcdic-es-a.la \
ebcdic-es-s.la ebcdic-fi-se.la ebcdic-fi-se-a.la ebcdic-fr.la \
ebcdic-it.la ebcdic-pt.la ebcdic-uk.la ebcdic-us.la
RFC1345_IR = iso-ir-2.la iso-ir-4.la iso-ir-8-1.la iso-ir-8-2.la \
iso-ir-9-1.la iso-ir-9-2.la iso-ir-10.la iso-ir-11.la \
iso-ir-13.la iso-ir-14.la iso-ir-15.la iso-ir-16.la \
iso-ir-17.la iso-ir-18.la iso-ir-19.la iso-ir-21.la \
iso-ir-25.la iso-ir-27.la iso-ir-37.la iso-ir-47.la \
iso-ir-49.la iso-ir-50.la iso-ir-51.la iso-ir-54.la \
iso-ir-55.la iso-ir-57.la iso-ir-60.la iso-ir-61.la \
iso-ir-69.la iso-ir-70.la iso-ir-84.la iso-ir-85.la \
iso-ir-86.la iso-ir-88.la iso-ir-89.la iso-ir-90.la \
iso-ir-91.la iso-ir-92.la iso-ir-93.la iso-ir-94.la \
iso-ir-95.la iso-ir-96.la iso-ir-98.la iso-ir-99.la \
iso-ir-102.la iso-ir-103.la iso-ir-111.la iso-ir-121.la \
iso-ir-122.la iso-ir-123.la iso-ir-128.la iso-ir-139.la \
iso-ir-141.la iso-ir-142.la iso-ir-143.la iso-ir-146.la \
iso-ir-147.la iso-ir-150.la iso-ir-151.la iso-ir-152.la \
iso-ir-153.la iso-ir-154.la iso-ir-155.la iso-ir-158.la
RFC1345_MISC = dec-mcs.la hp-roman8.la iso646-dk.la iso646-kr.la macintosh.la
RFC1345_ALL = ${RFC1345_PC} ${RFC1345_EBCDIC} ${RFC1345_IR} ${RFC1345_MISC}
MODULES = ${CHARSETS_ALL} ${EXTRA_ALL} ${RFC1345_ALL}
all: ${MODULES}
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
1.1 apr-iconv/ces/Makefile.in
Index: Makefile.in
===================================================================
MODULES_CORE= _tbl_simple.la euc-jp.la euc-kr.la euc-tw.la gb2312.la \
iso-10646-ucs-2.la iso-10646-ucs-4.la \
ucs2-internal.la ucs4-internal.la utf-8.la utf-16.la
MODULES_EXTRA = unicode-1-1-utf-7.la iso-2022-cn.la iso-2022-jp.la \
iso-2022-jp-2.la iso-2022-kr.la
MODULES = ${MODULES_CORE} ${MODULES_EXTRA}
all: ${MODULES}
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
1.1 apr-iconv/lib/Makefile.in
Index: Makefile.in
===================================================================
LIB= iconv
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
SRCS= iconv_module.c iconv.c iconv_int.c iconv_uc.c \
iconv_ces.c iconv_ces_euc.c iconv_ces_iso2022.c
LIBDIR= ${PREFIX}/lib
INCDIR= ${PREFIX}/include
INCS= iconv.h
CFLAGS+= -DICONV_DEFAULT_PATH=\"${MODULEDIR}\"
MAN3= iconv.3 iconv_open.3 iconv_close.3
iconv.3: iconv.3.in
sed "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET}
iconv_open.3: iconv_open.3.in
sed "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET}
CLEANFILES= lib${LIB}.a ${SHLIB_NAME} ${SHLIB_LINK} ${SOBJS} ${OBJS} \
iconv.3 iconv_open.3
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
1.1 apr-iconv/util/Makefile.in
Index: Makefile.in
===================================================================
TARGETS =
PROGRAMS = iconv
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
all: $(PROGRAMS)
iconv_OBJECTS = iconv.lo iconv_stream.lo
iconv_LDADD = ../liblibiconv.la
iconv: $(iconv_OBJECTS) $(iconv_LDADD)
$(LINK) $(iconv_OBJECTS) $(iconv_LDADD)