Menu
▾
▴
[pclasses-cvs] pclasses2 Makefile.toc,1.3,1.4 configure.pclasses2,1.6,1.7 toc.pclasses2.make.at,1.3,1.4
|
From: stephan b. <sg...@us...> - 2004-12-24 23:07:06
|
Update of /cvsroot/pclasses/pclasses2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8043 Modified Files: Makefile.toc configure.pclasses2 toc.pclasses2.make.at Log Message: Mass commit: build fixes. Can now build tests using proper configure steps, at least on linux systems. Index: toc.pclasses2.make.at =================================================================== RCS file: /cvsroot/pclasses/pclasses2/toc.pclasses2.make.at,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- toc.pclasses2.make.at 24 Dec 2004 12:44:00 -0000 1.3 +++ toc.pclasses2.make.at 24 Dec 2004 23:06:25 -0000 1.4 @@ -3,13 +3,40 @@ CLEAN_FILES += $(wildcard *.o *~) + +INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/include/pclasses $(PACKAGE_INCLUDES) + # CXXFLAGS += -fPIC ifneq (,$(wildcard Makefile.am)) DIST_FILES += Makefile.am endif -INSTALL_PACKAGE_HEADERS_DEST = $(prefix)/include/pclasses +######################################################################## +INSTALL_PACKAGE_HEADERS_BASE = $(prefix)/include/pclasses +INSTALL_PACKAGE_HEADERS_DEST = $(INSTALL_PACKAGE_HEADERS_BASE) +# ^^^^ modules must override this to: +# INSTALL_PACKAGE_HEADERS_DEST = $(INSTALL_PACKAGE_HEADERS_BASE)/ModuleName +######################################################################## -INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/include/pclasses $(PACKAGE_INCLUDES) +######################################################################## +# P_BACKLINK_LDADD is for use by in-tree libs which need a -L arg +# to link back to other in-tree libs. +P_BACKLINK_LDADD = -L$(top_srcdir)/lib \ + -L$(top_srcdir)/src \ + $(addprefix -L$(top_srcdir)/src/,System Util Unicode IO Net) + +#################################################################################### +# Linker args for in-build-tree tests, so they can link back to the in-tree +# shared libs easily... +LIBP_TESTS_LDADD = $(P_BACKLINK_LDADD) -L$(top_srcdir)/lib $(LIBPCORE_CLIENT_LDADD) + +######################################################################## +# Huge kludge to shut up make: +-l$(LIBPCORE_BASENAME): +-l$(LIBPNET_BASENAME): +-l$(LIBPIO_BASENAME): +-l$(LIBPUNICODE_BASENAME): +-l$(LIBPSYSTEM_BASENAME): +-l$(LIBPUTIL_BASENAME): Index: configure.pclasses2 =================================================================== RCS file: /cvsroot/pclasses/pclasses2/configure.pclasses2,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- configure.pclasses2 24 Dec 2004 12:44:00 -0000 1.6 +++ configure.pclasses2 24 Dec 2004 23:06:25 -0000 1.7 @@ -24,9 +24,8 @@ # reminder: need to add SharedLib.ltdl.cpp -toc_test libltdl || toc_test_require libdl # prefer ltdl, else allow dl. -# toc_test_require libdl -ldadd="${ldadd} ${LDADD_DL}" +# toc_test libltdl || toc_test_require libdl # prefer ltdl, else allow dl. +toc_test_require libdl ############################################################ @@ -119,6 +118,9 @@ done rm sizes +toc_export LDADD_SHM="-lrt" + + cat <<EOF > /dev/null the following defs needs to be ported to toc: PTHREAD_CREATE_JOINABLE @@ -150,55 +152,61 @@ ######################################################################## # For each module, define: # -# LIBPxxx_NAME = the DLL file's name +# LIBPxxx_BASENAME = the DLL file's name # LIBPxxx_LDADD/INCLUDES = the linker/includes flags needed to build -# LIBPxxx_NAME -# LIBPxxx_CLIENT_LDADD = linker args for clients of LIBPxxx_NAME. +# LIBPxxx_BASENAME +# The INCLUDES will also be used by clients. +# LIBPxxx_CLIENT_LDADD = linker args for clients of LIBPxxx_BASENAME. ######################################################################## -toc_export LIBPCORE_NAME=libpclasses_core -toc_export LIBPCORE_LDADD="-l${LIBCORE_NAME}" -toc_export LIBPCORE_CLIENT_LDADD="${ldadd}" +toc_export LIBPCORE_BASENAME=pclasses_core +toc_export LIBPCORE_LDADD="" +toc_export LIBPCORE_CLIENT_LDADD="-l${LIBPCORE_BASENAME}" toc_export LIBPCORE_CFLAGS="${inc}" -toc_export LIBPNET_NAME=libpclasses_net -toc_export LIBPNET_LDADD="-l${LIBPNET_NAME}" -toc_export LIBPNET_CLIENT_LDADD="${ldadd}" -toc_export LIBPNET_CFLAGS="${inc}" +toc_export LIBPNET_BASENAME=pclasses_net +toc_export LIBPNET_LDADD="" +toc_export LIBPNET_CLIENT_LDADD="-l${LIBPNET_BASENAME}" +toc_export LIBPNET_CFLAGS="" -toc_export LIBPIO_NAME=libpclasses_io -toc_export LIBPIO_LDADD="-l${LIBPIO_NAME}" -toc_export LIBPIO_CLIENT_LDADD="${ldadd}" +toc_export LIBPIO_BASENAME=pclasses_io +toc_export LIBPIO_LDADD="${LIBPCORE_CLIENT_LDADD}" +toc_export LIBPIO_CLIENT_LDADD="-l${LIBPIO_BASENAME}" toc_export LIBPIO_CFLAGS="${inc}" -toc_export LIBPUNICODE_NAME=libpclasses_unicode -toc_export LIBPUNICODE_LDADD="-l${LIBPUNICODE_NAME}" -toc_export LIBPUNICODE_CLIENT_LDADD="${ldadd}" +toc_export LIBPUNICODE_BASENAME=pclasses_unicode +toc_export LIBPUNICODE_LDADD="${LIBPCORE_CLIENT_LDADD}" # ${LIBPIO_CLIENT_LDADD} circular dep +toc_export LIBPUNICODE_CLIENT_LDADD="-l${LIBPUNICODE_BASENAME}" toc_export LIBPUNICODE_CFLAGS="${inc}" -toc_export LIBPSYSTEM_NAME=libpclasses_system -toc_export LIBPSYSTEM_LDADD="-l${LIBPSYSTEM_NAME}" -toc_export LIBPSYSTEM_CLIENT_LDADD="${THREADS_CFLAGS}" +toc_export LIBPSYSTEM_BASENAME=pclasses_system +toc_export LIBPSYSTEM_LDADD="${THREADS_LDADD} ${LDADD_DL} ${LDADD_SHM}" +toc_export LIBPSYSTEM_CLIENT_LDADD="-l${LIBPSYSTEM_BASENAME} ${LIBPIO_CLIENT_LDADD} ${LIBPUNICODE_CLIENT_LDADD}" toc_export LIBPSYSTEM_CFLAGS="${THREADS_CFLAGS}" -toc_export LIBPUTIL_NAME=libpclasses_util -toc_export LIBPUTIL_LDADD="-l${LIBPUTIL_NAME_LDADD}" -toc_export LIBPUTIL_CLIENT_LDADD="${THREADS_LDADD}" +toc_export LIBPUTIL_BASENAME=pclasses_util +toc_export LIBPUTIL_LDADD="${THREADS_LDADD}" +toc_export LIBPUTIL_CLIENT_LDADD="-l${LIBPUTIL_BASENAME}" toc_export LIBPUTIL_CFLAGS="${THREADS_CFLAGS}" + ######################################################################## # Enable mysql driver... if test -x "${MYSQL_CONFIG_BIN}"; then toc_export LIBPSQL_HAVE_MYSQL=1 - toc_export LIBPSQL_MYSQL_LDADD="${ldadd} ${MYSQL_LIBS}" - toc_export LIBPSQL_MYSQL_CFLAGS="${inc} ${MYSQL_INCLUDES}" + toc_export LIBPSQL_MYSQL_LDADD="${MYSQL_LIBS}" + toc_export LIBPSQL_MYSQL_CFLAGS="${MYSQL_INCLUDES}" +else + toc_boldecho "Not building MySQL driver." fi ######################################################################## # Enable postgres driver... if test -x "${POSTGRES_CONFIG_BIN}"; then toc_export LIBPSQL_HAVE_POSTGRES=1 - toc_export LIBPSQL_POSTSQL_LDADD="${ldadd} ${POSTGRES_LIBS}" - toc_export LIBPSQL_POSTSQL_CFLAGS="${inc} ${POSTGRES_INCLUDES}" + toc_export LIBPSQL_POSTSQL_LDADD="${POSTGRES_LIBS}" + toc_export LIBPSQL_POSTSQL_CFLAGS="${POSTGRES_INCLUDES}" +else + toc_boldecho "Not building Postgres driver." fi @@ -209,10 +217,6 @@ # now exporting our files... ######################################################################## -toc_test_require atfilter_file \ - include/pclasses/pclasses-config.h.at \ - include/pclasses/pclasses-config.h - ######################################################################## toc_boldecho "======================= Creating Makefiles..." make_out=${PWD}/.toc.Makefile @@ -245,6 +249,11 @@ toc_boldecho "======================= ${TOC_EMOTICON_OKAY} Created Makefiles." ######################################################################## +toc_test_require atfilter_file \ + include/pclasses/pclasses-config.h.at \ + include/pclasses/pclasses-config.h + + ##### Create toc.make and end config process... this must come last. toc_test_require toc_project_makefile ######################################################################## Index: Makefile.toc =================================================================== RCS file: /cvsroot/pclasses/pclasses2/Makefile.toc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.toc 24 Dec 2004 10:58:46 -0000 1.3 +++ Makefile.toc 24 Dec 2004 23:06:25 -0000 1.4 @@ -1,15 +1,13 @@ #!/usr/bin/make -f include toc.make -SUBDIRS = AT include m4 src templates test doc toc - -DIST_FILES += README \ +SUBDIRS = AT include m4 src lib test doc toc templates +DIST_FILES += COPYING.LIB COPYING README \ NEWS \ ChangeLog \ - autogen.sh \ + autogen.sh configure.in Makefile.am \ find_toc.sh \ - notes.txt \ toc.$(PACKAGE_NAME).make.at \ toc.$(PACKAGE_NAME).help \ - configure configure.in configure.toc configure.$(PACKAGE_NAME) + configure configure.toc configure.$(PACKAGE_NAME) all: subdirs |
