Changeset 11554


Ignore:
Timestamp:
2006-04-02T16:52:33+12:00 (15 years ago)
Author:
kjdon
Message:

added support for USE_Z3950. This now gets passed down, and d2m and yaz get compiled.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/win32.mak

    r11257 r11554  
    3030DLL = 0
    3131DLLDEBUG = 0
     32USE_Z3950 = 0
    3233
    3334MDEFINES = /f win32.mak
     
    3839INSTALLDIRS = packages\mg\src\text src\mgpp\text src\recpt src\oaiservr \
    3940          src\hashfile src\db2txt src\txt2db
     41
     42YAZ_DIR = packages\yaz\yaz-2.1.4\win
    4043
    4144MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
     
    5356MAKECMD = $(MAKECMD) DLLDEBUG=1
    5457!ENDIF
     58!IF $(USE_Z3950)
     59MAKECMD = $(MAKECMD) USE_Z3950=1
     60OTHERDIRS = packages\d2m $(OTHERDIRS)
     61YAZ_DIRS = $(YAZ_DIR)
     62!ENDIF
    5563
    5664MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
    5765
    58 all: win32.mak $(OTHERDIRS) $(INSTALLDIRS)
     66all: win32.mak $(OTHERDIRS) $(YAZ_DIRS) $(INSTALLDIRS)
    5967
    6068install: win32.mak $(INSTALLDIRS)
     
    109117    cd "$(GSDLHOME)"
    110118
     119$(YAZ_DIR): FORCE
     120    cd "$@"
     121    nmake HAVE_ICONV=0 HAVE_LIBXML2=0
     122    cd "$(GSDLHOME)"
     123
    111124FORCE:
     125
Note: See TracChangeset for help on using the changeset viewer.