Changeset 16563


Ignore:
Timestamp:
07/28/08 16:53:09 (13 years ago)
Author:
davidb
Message:

Mods to Makefile.in and configure.in to work with newly organized files: gs2build gs2common and gs2runtime

Location:
gsdl/trunk
Files:
14 edited
2 moved

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/Makefile.in

    r16525 r16563  
    4747ALLFILES = $(OBJECTS)
    4848
    49 # indexers are treated slightly differently as we don't want to do make all/install
    50 INDEXERSDIR = indexers
    51 # all directories should be compiled
    52 COMPILEDIRS = packages src/lib src/gdbmedit/txt2db src/gdbmedit/db2txt src/gdbmedit/gdbmget src/gdbmedit/gdbmset src/hashfile src/getpw src/phind/generate src/colservr src/protocol src/z3950 src/recpt src/corba src/oaiservr
    53 # a subset of the directories get installed
    54 INSTALLDIRS = packages src/gdbmedit/db2txt src/gdbmedit/txt2db src/gdbmedit/gdbmget src/gdbmedit/gdbmset src/hashfile src/getpw src/phind/generate src/z3950 src/recpt src/corba src/oaiservr
     49
     50COMPILEDIRS = gs2common gs2build gs2runtime
     51
     52INSTALLDIRS = gs2common gs2build gs2runtime
    5553
    5654MODULEDIRS = @MODULEDIRS@
     
    5957# we don't want to compile the jni stuff in indexers for gs2
    6058all:
    61     for odir in $(INDEXERSDIR); do \
    62       echo making $@ in $$odir; \
    63       (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \
    64     done
    6559    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
    6660      echo making $@ in $$odir; \
     
    6963
    7064install: all
    71     for odir in $(INDEXERSDIR); do \
    72       echo making $@ in $$odir; \
    73       (cd $$odir && $(MAKE) $(MDEFINES) install-gs2) || exit 1; \
    74     done
    75     cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar bin/java/
    7665    for idir in $(INSTALLDIRS); do \
    7766      echo installing $$idir; \
     
    8170distclean: clean
    8271    rm -f Makefile config.cache config.h config.log stamp-h config.status
    83     for subdir in $(COMPILEDIRS) $(INDEXERSDIR); do \
     72    for subdir in $(COMPILEDIRS); do \
    8473      echo cleaning $@ in $$subdir; \
    8574      (cd $$subdir && $(MAKE) distclean) || exit 1; \
     
    8776
    8877clean:
    89     for subdir in $(COMPILEDIRS) $(INDEXERSDIR); do \
     78    for subdir in $(COMPILEDIRS); do \
    9079      echo cleaning $@ in $$subdir; \
    9180      (cd $$subdir && $(MAKE) clean) || exit 1; \
  • gsdl/trunk/configure

    r16288 r16563  
    272272PACKAGE_BUGREPORT=
    273273
    274 ac_unique_file="src/lib/text_t.h"
    275274# Factoring default headers for most tests.
    276275ac_includes_default="\
     
    310309#endif"
    311310
    312 ac_subdirs_all="$ac_subdirs_all packages indexers"
     311ac_subdirs_all="$ac_subdirs_all gs2common gs2build gs2runtime"
    313312ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD USE_SQLITE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
    314313ac_subst_files=''
     
    74487447
    74497448
    7450 subdirs="$subdirs packages indexers"
     7449subdirs="$subdirs gs2common gs2build gs2runtime"
    74517450
    74527451
    74537452# the list of folders in the src folder
    7454 srclist="src/lib/Makefile \
    7455      src/hashfile/Makefile \
    7456          src/colservr/Makefile \
    7457          src/corba/Makefile \
    7458          src/protocol/Makefile \
    7459          src/recpt/Makefile \
    7460          src/gdbmedit/db2txt/Makefile \
    7461          src/gdbmedit/txt2db/Makefile \
    7462          src/gdbmedit/gdbmget/Makefile \
    7463          src/gdbmedit/gdbmset/Makefile \
    7464          src/oaiservr/Makefile \
    7465          src/z3950/Makefile \
    7466          src/getpw/Makefile \
    7467          src/phind/generate/Makefile"
    7468 
    7469                                         ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs"
     7453srclist="gs2common/Makefile \
     7454         gs2build/Makefile \
     7455         gs2runtime/Makefile"
     7456
     7457                              ac_config_files="$ac_config_files Makefile $srclist $moduleDirs"
    74707458cat >confcache <<\_ACEOF
    74717459# This file is a shell script that caches the results of configure
     
    79937981  case "$ac_config_target" in
    79947982  # Handling of arguments.
    7995   "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
    79967983  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    79977984  "$srclist" ) CONFIG_FILES="$CONFIG_FILES $srclist" ;;
  • gsdl/trunk/configure.in

    r16561 r16563  
    22dnl Use autoconf-2.59 or later... it might not work anymore with
    33dnl the older 2.1x versions - jrm21 12/2004
    4 AC_INIT(src/lib/text_t.h)
     4AC_INIT()
    55AC_CONFIG_HEADER(config.h)
    66
    77PACKAGE=gsdl
    8 VERSION=2.1
     8VERSION=2.82-svn
    99AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
    1010AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
  • gsdl/trunk/etc/error.txt

    r15076 r16563  
     1Warning: couldn't read build.cfg file for collection "demo"  gsdlhome="/research/code/greenstone2-split"
     2  collecthome="/research/code/greenstone2-split/collect"
     3dynamicclassifieraction::define_external_macros called with NULL collectproto
     4Warning: couldn't read build.cfg file for collection "demo"  gsdlhome="/research/code/greenstone2-split"
     5  collecthome="/research/code/greenstone2-split/collect"
     6dynamicclassifieraction::define_external_macros called with NULL collectproto
  • gsdl/trunk/gs2build/packages/isis-gdl/configure

    r15553 r16563  
    272272PACKAGE_BUGREPORT=
    273273
    274 ac_default_prefix=../..
     274ac_default_prefix=../../..
    275275ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
    276276ac_subst_files=''
     
    12471247
    12481248ac_aux_dir=
    1249 for ac_dir in ../.. $srcdir/../..; do
     1249for ac_dir in ../../.. $srcdir/../../..; do
    12501250  if test -f $ac_dir/install-sh; then
    12511251    ac_aux_dir=$ac_dir
     
    12631263done
    12641264if test -z "$ac_aux_dir"; then
    1265   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../.. $srcdir/../.." >&5
    1266 echo "$as_me: error: cannot find install-sh or install.sh in ../.. $srcdir/../.." >&2;}
     1265  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&5
     1266echo "$as_me: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&2;}
    12671267   { (exit 1); exit 1; }; }
    12681268fi
  • gsdl/trunk/gs2build/packages/isis-gdl/configure.in

    r6127 r16563  
    44dnl  default installation
    55dnl will be overridden by command-line args from packages/configure
    6 AC_PREFIX_DEFAULT(../..)
     6AC_PREFIX_DEFAULT(../../..)
    77
    88dnl this uses the config.guess, config.sub and install-sh from gsdl.
    9 AC_CONFIG_AUX_DIR(../..)
     9AC_CONFIG_AUX_DIR(../../..)
    1010
    1111dnl compiler - need c++
  • gsdl/trunk/gs2runtime/src/colservr/Makefile.in

    r15907 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29
     30INDEXERS_DIR = $(COMMON_DIR)/indexers
     31PACKAGES_DIR = $(GSDL_DIR)/gs2runtime/packages
    3032
    3133
     
    4749DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES)
    4850# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    49 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
     51INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
    5052    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
    5153    -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \
  • gsdl/trunk/gs2runtime/src/oaiservr/Makefile.in

    r15907 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
    30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
    31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol
    32 RECPT_DIR = $(GSDL_DIR)/src/recpt
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29RUNTIME_DIR = $(GSDL_DIR)/gs2runtime
     30
     31INDEXERS_DIR = $(COMMON_DIR)/indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)/packages
     33COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
     34PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
     35RECPT_DIR = $(RUNTIME_DIR)/src/recpt
    3336
    3437
     
    4245USE_SQLITE = @USE_SQLITE@
    4346ifeq ($(USE_SQLITE), 1)
    44 SQLITE_LIBS = $(PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
     47SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
    4548else
    4649SQLITE_LIBS =
     
    5255CXX = @CXX@
    5356CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    54 INCLUDES = -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
     57INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
    5558LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    5659LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     
    118121    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    119122    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    120     $(GSDL_DIR)/src/lib/gsdllib.a
     123    $(COMMON_DIR)/src/lib/gsdllib.a
    121124
    122125EXECUTABLE_OBJECTS = \
  • gsdl/trunk/gs2runtime/src/protocol/Makefile.in

    r15907 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
    30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29
     30INDEXERS_DIR = $(COMMON_DIR)/indexers
     31PACKAGES_DIR = $(GSDL_DIR)/gs2runtime/packages
     32COLSERVR_DIR = $(GSDL_DIR)/gs2runtime/src/colservr
    3133
    3234
     
    3638DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    3739# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    38 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
     40INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
    3941RANLIB = @RANLIB@
    4042
  • gsdl/trunk/gs2runtime/src/recpt/Makefile.in

    r16323 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
    30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
    31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol
    32 Z3950_DIR = $(GSDL_DIR)/src/z3950
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29RUNTIME_DIR = $(GSDL_DIR)/gs2runtime
     30
     31INDEXERS_DIR = $(COMMON_DIR)/indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)/packages
     33COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
     34PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
     35Z3950_DIR = $(RUNTIME_DIR)/src/z3950
    3336
    3437
     
    5356USE_SQLITE = @USE_SQLITE@
    5457ifeq ($(USE_SQLITE), 1)
    55 SQLITE_LIBS = $(PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
     58SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
    5659else
    5760SQLITE_LIBS =
     
    7679CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    7780DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
    78 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
     81INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
    7982        -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    8083    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
     
    194197    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    195198    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    196     $(GSDL_DIR)/src/lib/gsdllib.a
     199    $(COMMON_DIR)/src/lib/gsdllib.a
    197200
    198201EXECUTABLE_OBJECTS = \
Note: See TracChangeset for help on using the changeset viewer.