Ignore:
Timestamp:
2008-12-04T09:33:05+13:00 (15 years ago)
Author:
mdewsnip
Message:

Argh, somebody has messed up the nice tidy makefiles, and added a whole bunch of bad paths (particularly for Z39.50 compilation)...

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

Legend:

Unmodified
Added
Removed

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

    r17476 r18048  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
     32COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
    3233PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3334
    … …  
    5556!IF $(USE_SQLITE)
    5657SQLITE_DEFINES = -DUSE_SQLITE
    57 SQLITE_INCLUDES = -I"$(COMMON_DIR)\packages\sqlite\include"
     58SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
    5859!ELSE
    5960SQLITE_DEFINES =
    … …  
    7677    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    7778    -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
    78     -I"$(COMMON_DIR)\packages\windows\expat\expat" -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" $(SQLITE_INCLUDES)
     79    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES)
    7980
    8081!IF $(GSDL_VC4)
    8182DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    82 INCLUDES = $(INCLUDES) -I"$(COMMON_DIR)\packages\windows\stlport\stlport"
     83INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
    8384!ENDIF
    8485

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

    r16908 r18048  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
    32 COMMON_PACKAGES = $(COMMON_DIR)\packages
    33 
     32COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
    3433PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3534COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    … …  
    6766
    6867!IF $(USE_SQLITE)
    69 SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib"
     68SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    7069!ELSE
    7170SQLITE_LIBS =
    … …  
    7877        -DGSDL_NOCACHE
    7978INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    80         -I"$(INDEXERS_DIR)\mgpp\text" -I"$(COMMON_PACKAGES)\windows\crypt\crypt" \
    81     -I"$(COMMON_PACKAGES)\windows\expat\expat" -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm"
     79        -I"$(INDEXERS_DIR)\mgpp\text" -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \
     80    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
    8281LDFLAGS =
    83 LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \
    84         "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     82LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
     83        "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    8584
    8685!IF $(GSDL_VC4)
    8786DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    88 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
     87INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
    8988!ENDIF
    9089!IF $(LOCAL_LIBRARY)

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

    r16577 r18048  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
    32 COMMON_PACKAGES = $(COMMON_DIR)\packages
    33 
     32COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
    3433COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    3534
    … …  
    6059# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    6160INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
    62      -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm"
     61     -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
    6362
    6463!IF $(GSDL_VC4)
    6564DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    66 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
     65INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
    6766!ENDIF
    6867

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

    r16908 r18048  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
    32 COMMON_PACKAGES = $(COMMON_DIR)\packages
    33 
    34 
     32COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
    3533PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3634COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    … …  
    6967
    7068!IF $(USE_SQLITE)
    71 SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib"
     69SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    7270!ELSE
    7371SQLITE_LIBS =
    … …  
    7775Z3950_DEFS = -DUSE_Z3950
    7876Z3950_INCLUDES = -I$(Z3950_DIR)
    79 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(COMMON_PACKAGES)\yaz\yaz-2.1.4\lib\yaz.lib
     77Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib
    8078!ELSE
    8179Z3950_DEFS =
    … …  
    9189INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    9290    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
    93     -I"$(COMMON_PACKAGES)\windows\crypt\crypt" -I"$(COMMON_PACKAGES)\windows\expat\expat" \
    94     -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" $(Z3950_INCLUDES)
     91    -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" \
     92    -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" $(Z3950_INCLUDES)
    9593LDFLAGS =
    96 LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \
    97         "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
     94LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
     95        "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
    9896
    9997!IF $(GSDL_VC4)
    10098DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    101 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
     99INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
    102100!ENDIF
    103101!IF $(LOCAL_LIBRARY)

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

    r16908 r18048  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
    32 COMMON_PACKAGES = $(COMMON_DIR)\packages
    33 
     32COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
    3433PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3534COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    … …  
    5655
    5756!IF $(USE_SQLITE)
    58 SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib"
     57SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    5958!ELSE
    6059SQLITE_LIBS =
    … …  
    6766INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    6867    -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \
    69     -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" \
     68    -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" \
    7069        -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    7170        -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
    7271LDFLAGS =
    73 LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \
    74         "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     72LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
     73        "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    7574RSC = rc
    7675WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \
    … …  
    8281!IF $(GSDL_VC4)
    8382DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    84 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
     83INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
    8584!ENDIF
    8685

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

    r16908 r18048  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
     32COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
    3233PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3334COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    … …  
    6364
    6465!IF $(USE_SQLITE)
    65 SQLITE_LIBS = "$(PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     66SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    6667!ELSE
    6768SQLITE_LIBS =
    … …  
    7677    -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
    7778    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
    78     -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
     79    -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
    7980LDFLAGS =
    80 LIBS = "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" \
     81LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" \
    8182        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \
    8283    $(SQLITE_LIBS)
    … …  
    8485!IF $(GSDL_VC4)
    8586DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    86 INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport"
     87INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
    8788!ENDIF
    8889
Note: See TracChangeset for help on using the changeset viewer.