Changeset 16574


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

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

Location:
gsdl/trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/build-src/packages/isis-gdl/win32.mak

    r12754 r16574  
    11# ISIS-GDL
    22
    3 GSDLHOME = ..\..
     3GSDLHOME = ..\..\..
    44
    55CC = cl
  • gsdl/trunk/build-src/src/hashfile/win32.mak

    r11256 r16574  
    2525###########################################################################
    2626 
    27 GSDLHOME = ..\..
     27GSDLHOME = ..\..\..
    2828GSDL_VC4 = 0
    2929
  • gsdl/trunk/build-src/src/phind/generate/win32.mak

    r11257 r16574  
    2525###########################################################################
    2626
    27 GSDLHOME = ..\..\..
     27GSDLHOME = ..\..\..\..
    2828GSDL_VC4 = 0
    29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
     29STLPATH = "$(GSDLHOME)\common-src\packages\windows\stlport\stlport"
    3030
    3131AR = lib
  • gsdl/trunk/common-src/src/gdbmedit/db2txt/win32.mak

    r15912 r16574  
    2525###########################################################################
    2626
    27 GSDLHOME = ..\..
     27GSDLHOME = ..\..\..\..\..
     28COMMONHOME = $(GSDLHOME)\common-src
     29
    2830GSDL_VC4 = 0
    29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
     31STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport"
    3032
    3133AR = lib
     
    4143
    4244DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE
    43 INCLUDES = -I"$(GSDLHOME)\src\db2txt" -I"$(GSDLHOME)\src\lib" -I"$(GSDLHOME)\packages\mg\lib" \
    44        -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
     45INCLUDES = -I"$(COMMONHOME)\src\db2txt" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \
     46       -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
    4547!IF $(GSDL_VC4)
    4648DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
     
    4850!ENDIF
    4951
    50 LIBS = "$(GSDLHOME)\indexers\mg\lib\unitool.obj" "$(GSDLHOME)\src\lib\gsdllib.lib" \
    51        "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
     52LIBS = "$(COMMONHOME)\indexers\mg\lib\unitool.obj" "$(COMMONHOME)\src\lib\gsdllib.lib" \
     53       "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    5254
    5355COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
  • gsdl/trunk/common-src/src/gdbmedit/gdbmget/win32.mak

    r15230 r16574  
    2525###########################################################################
    2626
    27 GSDLHOME = ..\..\..\..
     27GSDLHOME = ..\..\..\..\..
     28COMMONHOME = $(GSDLHOME)\common-src
     29
    2830USE_STLPORT = 0
    29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
     31STLPATH = "$(COMMONHOME)packages\windows\stlport\stlport"
    3032
    3133AR = lib
     
    3537
    3638DEFS = -D__WIN32__ -DHAVE_CONFIG_H
    37 INCLUDES = -I"$(GSDLHOME)\lib" \
    38        -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
     39INCLUDES = -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
    3940!IF $(USE_STLPORT)
    4041DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
     
    4243!ENDIF
    4344
    44 LIBS = "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
     45LIBS = "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    4546
    4647COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
  • gsdl/trunk/common-src/src/gdbmedit/gdbmset/win32.mak

    r15230 r16574  
    2525###########################################################################
    2626
    27 GSDLHOME = ..\..\..\..
     27GSDLHOME = ..\..\..\..\..
     28COMMONHOME = $(GSDLHOME)\common-src
     29
    2830USE_STLPORT = 0
    29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
     31STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport"
    3032
    3133AR = lib
     
    3537
    3638DEFS = -D__WIN32__ -DHAVE_CONFIG_H
    37 INCLUDES = -I"$(GSDLHOME)\lib" \
    38        -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
     39INCLUDES = -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
    3940!IF $(USE_STLPORT)
    4041DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
     
    4243!ENDIF
    4344
    44 LIBS = "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
     45LIBS = "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    4546
    4647COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
  • gsdl/trunk/common-src/src/gdbmedit/txt2db/win32.mak

    r15912 r16574  
    2525###########################################################################
    2626
    27 GSDLHOME = ..\..
     27GSDLHOME = ..\..\..\..\..
     28COMMONHOME = $(GSDLHOME)\common-src
     29
    2830GSDL_VC4 = 0
    29 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
     31STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport"
    3032
    3133AR = lib
     
    4143
    4244DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE
    43 INCLUDES = -I"$(GSDLHOME)\src\txt2db" -I"$(GSDLHOME)\src\lib" -I"$(GSDLHOME)\indexers\mg\lib" \
    44        -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
     45INCLUDES = -I"$(COMMONHOME)\src\txt2db" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \
     46       -I"$(COMMONHOME)\packages\windows\gdbm\gdbm"
    4547!IF $(GSDL_VC4)
    4648DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
     
    4850!ENDIF
    4951
    50 LIBS = "$(GSDLHOME)\indexers\mg\lib\unitool.obj" "$(GSDLHOME)\src\lib\gsdllib.lib" \
    51        "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
     52LIBS = "$(COMMONHOME)\indexers\mg\lib\unitool.obj" "$(COMMONHOME)\src\lib\gsdllib.lib" \
     53       "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    5254
    5355COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
  • 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 = \
  • gsdl/trunk/win32.mak

    r16325 r16574  
    3535MDEFINES = /f win32.mak
    3636
    37 INDEXERSDIR = indexers
     37COMPILEDIRS = common-src build-src runtime-src
    3838
    39 COMPILEDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
    40         packages\windows\expat\expat src\lib src\colservr src\protocol
     39INSTALLDIRS = common-src build-src runtime-src
    4140
    42 INSTALLDIRS = src\hashfile src\gdbmedit\db2txt src\gdbmedit\txt2db src\phind\generate \
    43         src\recpt src\oaiservr
    44 
    45 PACKAGEDIRS =
    46 
    47 SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.5.9
    48 YAZ_DIR = packages\yaz\yaz-2.1.4\win
    4941
    5042MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
     43
    5144!IF $(GSDL_VC4)
    5245MAKECMD = $(MAKECMD) GSDL_VC4=1
     
    5447!IF $(LOCAL_LIBRARY)
    5548MAKECMD = $(MAKECMD) LOCAL_LIBRARY=1
    56 INSTALLDIRS = $(INSTALLDIRS) src\w32server
    5749!ENDIF
    5850!IF $(DLL)
     
    6456!IF $(USE_SQLITE)
    6557MAKECMD = $(MAKECMD) USE_SQLITE=1
    66 PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR)
    6758!ENDIF
    6859!IF $(USE_Z3950)
    6960MAKECMD = $(MAKECMD) USE_Z3950=1
    70 INSTALLDIRS = src\z3950 $(INSTALLDIRS)
    71 PACKAGEDIRS = $(PACKAGEDIRS) packages\d2m $(YAZ_DIR)
    7261!ENDIF
    7362
    7463MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
    7564
    76 all: win32.mak $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)
     65all: win32.mak $(COMPILEDIRS) $(INSTALLDIRS)
    7766
    78 install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS)
     67install: win32.mak $(INSTALLDIRS)
    7968
    8069clean:
    81     cd packages\windows\crypt\crypt
     70    cd common-src
    8271    $(MAKECLEANCMD)
    8372    cd "$(GSDLHOME)"
    84     cd packages\windows\gdbm\gdbm
     73    cd build-src
    8574    $(MAKECLEANCMD)
    8675    cd "$(GSDLHOME)"
    87     cd packages\windows\expat\expat
     76    cd runtime-src
    8877    $(MAKECLEANCMD)
    89     cd "$(GSDLHOME)"
    90     cd src\lib
    91     $(MAKECLEANCMD)
    92     cd "$(GSDLHOME)"
    93     cd src\colservr
    94     $(MAKECLEANCMD)
    95     cd "$(GSDLHOME)"
    96     cd src\protocol
    97     $(MAKECLEANCMD)
    98     cd "$(GSDLHOME)"
    99     cd src\recpt
    100     $(MAKECLEANCMD)
    101     cd "$(GSDLHOME)"
    102     cd src\oaiservr
    103     $(MAKECLEANCMD)
    104     cd "$(GSDLHOME)"
    105     cd src\w32server
    106     $(MAKECLEANCMD)
    107     cd "$(GSDLHOME)"
    108     cd src\phind\generate
    109     $(MAKECLEANCMD)
    110     cd "$(GSDLHOME)"
    111     cd src\hashfile
    112     $(MAKECLEANCMD)
    113     cd "$(GSDLHOME)"
    114     cd src\gdbmedit\txt2db
    115     $(MAKECLEANCMD)
    116     cd "$(GSDLHOME)"
    117     cd src\gdbmedit\db2txt
    118     $(MAKECLEANCMD)
    119     cd "$(GSDLHOME)"
    120     cd indexers
    121     call winMake.bat clean
    12278    cd "$(GSDLHOME)"
    12379
     
    13389    cd "$(GSDLHOME)"
    13490
    135 $(SQLITE_DIR): FORCE
    136     cd "$@"
    137     $(MAKECMD)
    138     $(MAKECMD) install
    139     cd "$(GSDLHOME)"
    140 
    141 $(YAZ_DIR): FORCE
    142     cd "$@"
    143     nmake HAVE_ICONV=0 HAVE_LIBXML2=0
    144     cd "$(GSDLHOME)"
    145 
    146 $(INDEXERSDIR): FORCE
    147     cd "$@"
    148     call winMake.bat all gs2
    149     call winMake.bat install gs2
    150     if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows"
    151     if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java"
    152     for %%i in (bin\*.exe) do \
    153       copy %%i "$(GSDLHOME)\bin\windows"
    154     copy lucene-gs\LuceneWrapper.jar "$(GSDLHOME)\bin\java"
    155     cd "$(GSDLHOME)"
    156 
    15791FORCE:
    15892
Note: See TracChangeset for help on using the changeset viewer.