Changeset 15907


Ignore:
Timestamp:
2008-06-09T12:58:10+12:00 (16 years ago)
Author:
mdewsnip
Message:

Moving "lib" directory into "src", to keep all the source code together. Not tested yet.

Location:
gsdl/trunk
Files:
15 edited
1 moved

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/Makefile.in

    r15513 r15907  
    5050INDEXERSDIR = indexers
    5151# all directories should be compiled
    52 COMPILEDIRS = packages lib src/gdbmedit/txt2db src/gdbmedit/db2txt src/hashfile src/getpw src/phind/generate src/colservr src/protocol src/z3950 src/recpt src/corba src/oaiservr
     52COMPILEDIRS = packages src/lib src/gdbmedit/txt2db src/gdbmedit/db2txt src/hashfile src/getpw src/phind/generate src/colservr src/protocol src/z3950 src/recpt src/corba src/oaiservr
    5353# a subset of the directories get installed
    5454INSTALLDIRS = packages src/gdbmedit/txt2db src/gdbmedit/db2txt src/hashfile src/getpw src/phind/generate src/z3950 src/recpt src/corba src/oaiservr

  • gsdl/trunk/configure

    r15901 r15907  
    74527452
    74537453# the list of folders in the src folder
    7454 srclist="src/hashfile/Makefile src/colservr/Makefile src/corba/Makefile src/protocol/Makefile src/recpt/Makefile src/gdbmedit/txt2db/Makefile \
    7455           src/oaiservr/Makefile src/z3950/Makefile src/gdbmedit/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
    7456 
    7457                                                   ac_config_files="$ac_config_files packages/Makefile lib/Makefile Makefile $srclist $moduleDirs"
     7454srclist="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/oaiservr/Makefile \
     7463         src/z3950/Makefile \
     7464         src/getpw/Makefile \
     7465         src/phind/generate/Makefile"
     7466
     7467                                        ac_config_files="$ac_config_files packages/Makefile Makefile $srclist $moduleDirs"
    74587468cat >confcache <<\_ACEOF
    74597469# This file is a shell script that caches the results of configure
    … …  
    79827992  # Handling of arguments.
    79837993  "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
    7984   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
    79857994  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    79867995  "$srclist" ) CONFIG_FILES="$CONFIG_FILES $srclist" ;;

  • gsdl/trunk/configure.in

    r15901 r15907  
    457457
    458458# the list of folders in the src folder
    459 srclist="src/hashfile/Makefile src/colservr/Makefile src/corba/Makefile src/protocol/Makefile src/recpt/Makefile src/gdbmedit/txt2db/Makefile \
    460           src/oaiservr/Makefile src/z3950/Makefile src/gdbmedit/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
    461 
    462 AC_OUTPUT(packages/Makefile lib/Makefile Makefile $srclist $moduleDirs)
    463 
    464 
     459srclist="src/lib/Makefile \
     460     src/hashfile/Makefile \
     461         src/colservr/Makefile \
     462         src/corba/Makefile \
     463         src/protocol/Makefile \
     464         src/recpt/Makefile \
     465         src/gdbmedit/db2txt/Makefile \
     466         src/gdbmedit/txt2db/Makefile \
     467         src/oaiservr/Makefile \
     468         src/z3950/Makefile \
     469         src/getpw/Makefile \
     470         src/phind/generate/Makefile"
     471
     472AC_OUTPUT(packages/Makefile Makefile $srclist $moduleDirs)
     473
     474

  • gsdl/trunk/src/colservr/Makefile.in

    r15778 r15907  
    4747DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES)
    4848# 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)/lib \
     49INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
    5050    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
    5151    -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \

  • gsdl/trunk/src/colservr/win32.mak

    r15851 r15907  
    6464        -DXML_STATIC $(SQLITE_DEFINES)
    6565# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    66 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" \
     66INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" \
    6767    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    6868    -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \

  • gsdl/trunk/src/corba/Makefile.in

    r15833 r15907  
    6767CFLAGS = @CFLAGS@
    6868DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    69 INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text \
     69INCLUDES = -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text \
    7070    $(MICO_INCLUDES)
    7171INSTALL = @INSTALL@
    … …  
    113113    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    114114    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    115     $(GSDL_DIR)/lib/gsdllib.a
     115    $(GSDL_DIR)/src/lib/gsdllib.a
    116116
    117117CORBASERVER_EXECUTABLE_OBJECTS = \

  • gsdl/trunk/src/oaiservr/Makefile.in

    r15844 r15907  
    5252CXX = @CXX@
    5353CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    54 INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
     54INCLUDES = -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
    5555LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    5656LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    … …  
    118118    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    119119    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    120     $(GSDL_DIR)/lib/gsdllib.a
     120    $(GSDL_DIR)/src/lib/gsdllib.a
    121121
    122122EXECUTABLE_OBJECTS = \

  • gsdl/trunk/src/oaiservr/win32.mak

    r15844 r15907  
    7272DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    7373        -DGSDL_NOCACHE
    74 INCLUDES = -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
     74INCLUDES = -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    7575        -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\windows\crypt\crypt" \
    7676    -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
    … …  
    144144    "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
    145145    "$(COLSERVR_DIR)\gsdlcolservr.lib" \
    146     "$(GSDL_DIR)\lib\gsdllib.lib" \
    147146    "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
    148147    "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
    149148    "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    150     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
     149    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
     150    "$(GSDL_DIR)\src\lib\gsdllib.lib"
    151151
    152152EXECUTABLE_OBJECTS = \

  • gsdl/trunk/src/protocol/Makefile.in

    r15580 r15907  
    3636DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    3737# 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)/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
     38INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
    3939RANLIB = @RANLIB@
    4040

  • gsdl/trunk/src/protocol/win32.mak

    r15789 r15907  
    5555DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    5656# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    57 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
     57INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
    5858     -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
    5959

  • gsdl/trunk/src/recpt/Makefile.in

    r15780 r15907  
    7676CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    7777DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
    78 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib \
     78INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
    7979        -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    8080    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
    … …  
    194194    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    195195    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    196     $(GSDL_DIR)/lib/gsdllib.a
     196    $(GSDL_DIR)/src/lib/gsdllib.a
    197197
    198198EXECUTABLE_OBJECTS = \

  • gsdl/trunk/src/recpt/win32.mak

    r15827 r15907  
    8383DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    8484        -DGSDL_NOCACHE $(Z3950_DEFS)
    85 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     85INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    8686    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
    8787    -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \
    … …  
    205205    "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
    206206    "$(COLSERVR_DIR)\gsdlcolservr.lib" \
    207     "$(GSDL_DIR)\lib\gsdllib.lib" \
    208207    "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
    209208    "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
    210209    "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    211     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
     210    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
     211    "$(GSDL_DIR)\src\lib\gsdllib.lib"
    212212
    213213EXECUTABLE_OBJECTS = \

  • gsdl/trunk/src/w32server/win32.mak

    r15829 r15907  
    6060CC = cl
    6161DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    62 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
     62INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    6363    -I"$(GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \
    6464    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \
    … …  
    128128    "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
    129129    "$(COLSERVR_DIR)\gsdlcolservr.lib" \
    130     "$(GSDL_DIR)\lib\gsdllib.lib" \
    131130    "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
    132131    "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
    133132    "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    134     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
     133    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
     134    "$(GSDL_DIR)\lib\gsdllib.lib"
    135135
    136136EXECUTABLE_OBJECTS = \

  • gsdl/trunk/src/z3950/Makefile.in

    r15792 r15907  
    5656GSDLOS = @gsdlos@
    5757# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
    58 INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
     58INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    5959    -I$(INDEXERS_DIR)/mgpp/text -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/include \
    6060    -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(PACKAGES_DIR)/d2m
    … …  
    117117    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    118118    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    119     $(GSDL_DIR)/lib/gsdllib.a
     119    $(GSDL_DIR)/src/lib/gsdllib.a
    120120
    121121EXECUTABLE_OBJECTS = \

  • gsdl/trunk/src/z3950/win32.mak

    r15830 r15907  
    7070DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    7171# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
    72 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     72INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    7373    -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
    7474    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
    … …  
    136136    $(INDEXERS_DIR)\mgpp/text/libmgpptext.lib \
    137137    $(INDEXERS_DIR)\mgpp/lib/libmgpplib.lib \
    138     $(GSDL_DIR)\lib\gsdllib.lib
     138    $(GSDL_DIR)\src\lib\gsdllib.lib
    139139
    140140EXECUTABLE_OBJECTS = \
Note: See TracChangeset for help on using the changeset viewer.