Changeset 16563
- Timestamp:
- 2008-07-28T16:53:09+12:00 (16 years ago)
- Location:
- gsdl/trunk
- Files:
-
- 14 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/Makefile.in
r16525 r16563 47 47 ALLFILES = $(OBJECTS) 48 48 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 50 COMPILEDIRS = gs2common gs2build gs2runtime 51 52 INSTALLDIRS = gs2common gs2build gs2runtime 55 53 56 54 MODULEDIRS = @MODULEDIRS@ … … 59 57 # we don't want to compile the jni stuff in indexers for gs2 60 58 all: 61 for odir in $(INDEXERSDIR); do \62 echo making $@ in $$odir; \63 (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \64 done65 59 for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 66 60 echo making $@ in $$odir; \ … … 69 63 70 64 install: all 71 for odir in $(INDEXERSDIR); do \72 echo making $@ in $$odir; \73 (cd $$odir && $(MAKE) $(MDEFINES) install-gs2) || exit 1; \74 done75 cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar bin/java/76 65 for idir in $(INSTALLDIRS); do \ 77 66 echo installing $$idir; \ … … 81 70 distclean: clean 82 71 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 \ 84 73 echo cleaning $@ in $$subdir; \ 85 74 (cd $$subdir && $(MAKE) distclean) || exit 1; \ … … 87 76 88 77 clean: 89 for subdir in $(COMPILEDIRS) $(INDEXERSDIR); do \78 for subdir in $(COMPILEDIRS); do \ 90 79 echo cleaning $@ in $$subdir; \ 91 80 (cd $$subdir && $(MAKE) clean) || exit 1; \ -
gsdl/trunk/configure
r16288 r16563 272 272 PACKAGE_BUGREPORT= 273 273 274 ac_unique_file="src/lib/text_t.h"275 274 # Factoring default headers for most tests. 276 275 ac_includes_default="\ … … 310 309 #endif" 311 310 312 ac_subdirs_all="$ac_subdirs_all packages indexers"311 ac_subdirs_all="$ac_subdirs_all gs2common gs2build gs2runtime" 313 312 ac_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' 314 313 ac_subst_files='' … … 7448 7447 7449 7448 7450 subdirs="$subdirs packages indexers"7449 subdirs="$subdirs gs2common gs2build gs2runtime" 7451 7450 7452 7451 7453 7452 # 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" 7453 srclist="gs2common/Makefile \ 7454 gs2build/Makefile \ 7455 gs2runtime/Makefile" 7456 7457 ac_config_files="$ac_config_files Makefile $srclist $moduleDirs" 7470 7458 cat >confcache <<\_ACEOF 7471 7459 # This file is a shell script that caches the results of configure … … 7993 7981 case "$ac_config_target" in 7994 7982 # Handling of arguments. 7995 "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;7996 7983 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 7997 7984 "$srclist" ) CONFIG_FILES="$CONFIG_FILES $srclist" ;; -
gsdl/trunk/configure.in
r16561 r16563 2 2 dnl Use autoconf-2.59 or later... it might not work anymore with 3 3 dnl the older 2.1x versions - jrm21 12/2004 4 AC_INIT( src/lib/text_t.h)4 AC_INIT() 5 5 AC_CONFIG_HEADER(config.h) 6 6 7 7 PACKAGE=gsdl 8 VERSION=2. 18 VERSION=2.82-svn 9 9 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") 10 10 AC_DEFINE_UNQUOTED(VERSION, "$VERSION") -
gsdl/trunk/etc/error.txt
r15076 r16563 1 Warning: couldn't read build.cfg file for collection "demo" gsdlhome="/research/code/greenstone2-split" 2 collecthome="/research/code/greenstone2-split/collect" 3 dynamicclassifieraction::define_external_macros called with NULL collectproto 4 Warning: couldn't read build.cfg file for collection "demo" gsdlhome="/research/code/greenstone2-split" 5 collecthome="/research/code/greenstone2-split/collect" 6 dynamicclassifieraction::define_external_macros called with NULL collectproto -
gsdl/trunk/gs2build/packages/isis-gdl/configure
r15553 r16563 272 272 PACKAGE_BUGREPORT= 273 273 274 ac_default_prefix=../.. 274 ac_default_prefix=../../.. 275 275 ac_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' 276 276 ac_subst_files='' … … 1247 1247 1248 1248 ac_aux_dir= 1249 for ac_dir in ../.. $srcdir/../..; do1249 for ac_dir in ../../.. $srcdir/../../..; do 1250 1250 if test -f $ac_dir/install-sh; then 1251 1251 ac_aux_dir=$ac_dir … … 1263 1263 done 1264 1264 if test -z "$ac_aux_dir"; then 1265 { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../.. $srcdir/../.." >&51266 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 1266 echo "$as_me: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&2;} 1267 1267 { (exit 1); exit 1; }; } 1268 1268 fi -
gsdl/trunk/gs2build/packages/isis-gdl/configure.in
r6127 r16563 4 4 dnl default installation 5 5 dnl will be overridden by command-line args from packages/configure 6 AC_PREFIX_DEFAULT(../.. )6 AC_PREFIX_DEFAULT(../../..) 7 7 8 8 dnl this uses the config.guess, config.sub and install-sh from gsdl. 9 AC_CONFIG_AUX_DIR(../.. )9 AC_CONFIG_AUX_DIR(../../..) 10 10 11 11 dnl compiler - need c++ -
gsdl/trunk/gs2runtime/src/colservr/Makefile.in
r15907 r16563 25 25 ########################################################################### 26 26 27 GSDL_DIR = ../.. 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 27 GSDL_DIR = ../../.. 28 COMMON_DIR = $(GSDL_DIR)/gs2common 29 30 INDEXERS_DIR = $(COMMON_DIR)/indexers 31 PACKAGES_DIR = $(GSDL_DIR)/gs2runtime/packages 30 32 31 33 … … 47 49 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES) 48 50 # 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 \51 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 50 52 -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \ 51 53 -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \ -
gsdl/trunk/gs2runtime/src/oaiservr/Makefile.in
r15907 r16563 25 25 ########################################################################### 26 26 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 27 GSDL_DIR = ../../.. 28 COMMON_DIR = $(GSDL_DIR)/gs2common 29 RUNTIME_DIR = $(GSDL_DIR)/gs2runtime 30 31 INDEXERS_DIR = $(COMMON_DIR)/indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)/packages 33 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 34 PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol 35 RECPT_DIR = $(RUNTIME_DIR)/src/recpt 33 36 34 37 … … 42 45 USE_SQLITE = @USE_SQLITE@ 43 46 ifeq ($(USE_SQLITE), 1) 44 SQLITE_LIBS = $( PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread47 SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread 45 48 else 46 49 SQLITE_LIBS = … … 52 55 CXX = @CXX@ 53 56 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 54 INCLUDES = -I$( GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text57 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text 55 58 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 56 59 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) … … 118 121 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 119 122 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \ 120 $( GSDL_DIR)/src/lib/gsdllib.a123 $(COMMON_DIR)/src/lib/gsdllib.a 121 124 122 125 EXECUTABLE_OBJECTS = \ -
gsdl/trunk/gs2runtime/src/protocol/Makefile.in
r15907 r16563 25 25 ########################################################################### 26 26 27 GSDL_DIR = ../.. 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr 27 GSDL_DIR = ../../.. 28 COMMON_DIR = $(GSDL_DIR)/gs2common 29 30 INDEXERS_DIR = $(COMMON_DIR)/indexers 31 PACKAGES_DIR = $(GSDL_DIR)/gs2runtime/packages 32 COLSERVR_DIR = $(GSDL_DIR)/gs2runtime/src/colservr 31 33 32 34 … … 36 38 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 37 39 # 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/text40 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text 39 41 RANLIB = @RANLIB@ 40 42 -
gsdl/trunk/gs2runtime/src/recpt/Makefile.in
r16323 r16563 25 25 ########################################################################### 26 26 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 27 GSDL_DIR = ../../.. 28 COMMON_DIR = $(GSDL_DIR)/gs2common 29 RUNTIME_DIR = $(GSDL_DIR)/gs2runtime 30 31 INDEXERS_DIR = $(COMMON_DIR)/indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)/packages 33 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 34 PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol 35 Z3950_DIR = $(RUNTIME_DIR)/src/z3950 33 36 34 37 … … 53 56 USE_SQLITE = @USE_SQLITE@ 54 57 ifeq ($(USE_SQLITE), 1) 55 SQLITE_LIBS = $( PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread58 SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread 56 59 else 57 60 SQLITE_LIBS = … … 76 79 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 77 80 DEFS = @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 \81 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 79 82 -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 80 83 -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \ … … 194 197 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 195 198 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \ 196 $( GSDL_DIR)/src/lib/gsdllib.a199 $(COMMON_DIR)/src/lib/gsdllib.a 197 200 198 201 EXECUTABLE_OBJECTS = \
Note:
See TracChangeset
for help on using the changeset viewer.