Ignore:
Timestamp:
2008-07-28T23:46:12+12:00 (16 years ago)
Author:
davidb
Message:

Adjustments to Windows makes file for new common-src, build-src and runtime-src file structure

Location:
gsdl/trunk/runtime-src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/runtime-src/packages/d2m/win32.mak

    r11256 r16574  
    55# Used by z3950server
    66
    7 GSDLHOME = ..\..
     7GSDLHOME = ..\..\..
    88GSDL_VC4 = 0
    99CC = cl

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

    r15907 r16574  
    2525###########################################################################
    2626
    27 GSDL_DIR = ..\..
    28 INDEXERS_DIR = $(GSDL_DIR)\indexers
    29 PACKAGES_DIR = $(GSDL_DIR)\packages
     27GSDL_DIR = ..\..\..
     28COMMON_DIR = $(GSDL_DIR)\common-src
     29RUNTIME_DIR = $(GSDL_DIR)\runtime-src
    3030
     31INDEXERS_DIR = $(COMMON_DIR)\indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3133
    3234GSDL_VC4 = 0
    … …  
    6466        -DXML_STATIC $(SQLITE_DEFINES)
    6567# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    66 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" \
     68INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" \
    6769    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    6870    -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \

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

    r15907 r16574  
    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)\common-src
     29RUNTIME_DIR = $(GSDL_DIR)\runtime-src
     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
    … …  
    7275DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    7376        -DGSDL_NOCACHE
    74 INCLUDES = -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
     77INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    7578        -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\windows\crypt\crypt" \
    7679    -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
    … …  
    148151    "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    149152    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
    150     "$(GSDL_DIR)\src\lib\gsdllib.lib"
     153    "$(COMMON_DIR)\src\lib\gsdllib.lib"
    151154
    152155EXECUTABLE_OBJECTS = \

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

    r15907 r16574  
    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)\common-src
     29RUNTIME_DIR = $(GSDL_DIR)\runtime-src
     30
     31INDEXERS_DIR = $(COMMON_DIR)\indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)\packages
     33COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    3134
    3235
    … …  
    5558DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    5659# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    57 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
     60INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
    5861     -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
    5962

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

    r15907 r16574  
    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)\common-src
     29RUNTIME_DIR = $(GSDL_DIR)\runtime-src
     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
    … …  
    8386DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    8487        -DGSDL_NOCACHE $(Z3950_DEFS)
    85 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     88INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    8689    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
    8790    -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \
    … …  
    209212    "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    210213    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
    211     "$(GSDL_DIR)\src\lib\gsdllib.lib"
     214    "$(COMMON_DIR)\src\lib\gsdllib.lib"
    212215
    213216EXECUTABLE_OBJECTS = \

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

    r15926 r16574  
    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)\common-src
     29RUNTIME_DIR = $(GSDL_DIR)\runtime-src
     30
     31INDEXERS_DIR = $(COMMON_DIR)\indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)\packages
     33COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
     34PROTOCOL_DIR = $(RUNTIME_DIR)\protocol
     35RECPT_DIR    = $(RUNTIME_DIR)\src\recpt
    3336
    3437
    … …  
    6063CC = cl
    6164DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    62 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    63     -I"$(GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \
     65INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
     66    -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \
    6467    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \
    65         -I"$(GSDL_DIR)\indexers\mg\lib" -I"$(GSDL_DIR)\indexers\mg\src\text" \
    66         -I"$(GSDL_DIR)\indexers\mgpp\lib" -I"$(GSDL_DIR)\indexers\mgpp\text"
     68        -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
     69        -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
    6770LDFLAGS =
    6871LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    … …  
    132135    "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    133136    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
    134     "$(GSDL_DIR)\src\lib\gsdllib.lib"
     137    "$(COMMON_DIR)\src\lib\gsdllib.lib"
    135138
    136139EXECUTABLE_OBJECTS = \
    … …  
    156159
    157160# Resources stuff
    158 SOURCE = "$(GSDL_DIR)\src\w32server\newgsdl.bmp"
    159 SOURCE = "$(GSDL_DIR)\src\w32server\resource.h"
    160 SOURCE = "$(GSDL_DIR)\src\w32server\server.ico"
    161 SOURCE = "$(GSDL_DIR)\src\w32server\gsdlcol.bmp"
    162 SOURCE = "$(GSDL_DIR)\src\w32server\server.rc"
     161SOURCE = "$(RUNTIME_DIR)\src\w32server\newgsdl.bmp"
     162SOURCE = "$(RUNTIME_DIR)\src\w32server\resource.h"
     163SOURCE = "$(RUNTIME_DIR)\src\w32server\server.ico"
     164SOURCE = "$(RUNTIME_DIR)\src\w32server\gsdlcol.bmp"
     165SOURCE = "$(RUNTIME_DIR)\src\w32server\server.rc"
    163166DEP_RSC_SERVE=\
    164     "$(GSDL_DIR)\src\w32server\gsdlcol.bmp"\
    165     "$(GSDL_DIR)\src\w32server\newgsdl.bmp"\
    166     "$(GSDL_DIR)\src\w32server\server.ico"
     167    "$(RUNTIME_DIR)\src\w32server\gsdlcol.bmp"\
     168    "$(RUNTIME_DIR)\src\w32server\newgsdl.bmp"\
     169    "$(RUNTIME_DIR)\src\w32server\server.ico"
    167170
    168 server.res : $(SOURCE) $(DEP_RSC_SERVE) "$(GSDL_DIR)\src\w32server"
    169    $(RSC) /l 0x409 /fo"$(GSDL_DIR)\src\w32server\server.res" /i "$(GSDL_DIR)\src\w32server" \
     171server.res : $(SOURCE) $(DEP_RSC_SERVE) "$(RUNTIME_DIR)\src\w32server"
     172   $(RSC) /l 0x409 /fo"$(RUNTIME_DIR)\src\w32server\server.res" /i "$(RUNTIME_DIR)\src\w32server" \
    170173 /d "NDEBUG" $(SOURCE)
    171174
    172 "$(GSDL_DIR)\src\w32server\server.res" : $(SOURCE) $(DEP_RSC_SERVE) "$(GSDL_DIR)\src\w32server"
    173    $(RSC) /l 0x409 /fo"$(GSDL_DIR)\src\w32server\server.res" /i "$(GSDL_DIR)\src\w32server" \
     175"$(RUNTIME_DIR)\src\w32server\server.res" : $(SOURCE) $(DEP_RSC_SERVE) "$(RUNTIME_DIR)\src\w32server"
     176   $(RSC) /l 0x409 /fo"$(RUNTIME_DIR)\src\w32server\server.res" /i "$(RUNTIME_DIR)\src\w32server" \
    174177 /d "NDEBUG" $(SOURCE)

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

    r15907 r16574  
    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
     27GSDL_DIR = ..\..\..
     28COMMON_DIR = $(GSDL_DIR)\common-src
     29RUNTIME_DIR = $(GSDL_DIR)\runtime-src
     30
     31INDEXERS_DIR = $(COMMON_DIR)\indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)\packages
     33COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
     34PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol
    3235
    3336
    … …  
    7073DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    7174# 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)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     75INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    7376    -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
    7477    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
    … …  
    136139    $(INDEXERS_DIR)\mgpp/text/libmgpptext.lib \
    137140    $(INDEXERS_DIR)\mgpp/lib/libmgpplib.lib \
    138     $(GSDL_DIR)\src\lib\gsdllib.lib
     141    $(COMMON_DIR)\src\lib\gsdllib.lib
    139142
    140143EXECUTABLE_OBJECTS = \
Note: See TracChangeset for help on using the changeset viewer.