Changeset 20873

Show
Ignore:
Timestamp:
02.11.2009 12:55:47 (10 years ago)
Author:
kjdon
Message:

updated makefiles to include the src/java/org/nzdl/gsdl folder

Location:
gsdl/trunk/build-src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/build-src/Makefile.in

    r16571 r20873  
    4848 
    4949# all directories should be compiled 
    50 COMPILEDIRS = packages src/hashfile src/phind/generate  
     50COMPILEDIRS = packages src/hashfile src/phind/generate src/java/org/nzdl/gsdl 
    5151# a subset of the directories get installed 
    52 INSTALLDIRS = packages src/hashfile src/phind/generate 
     52INSTALLDIRS = packages src/hashfile src/phind/generate  
    5353 
    5454MODULEDIRS = @MODULEDIRS@ 
     
    6666      (cd $$idir && $(MAKE) install) || exit 1; \ 
    6767    done 
     68    cp src/java/org/nzdl/gsdl/ApplyXSLT.jar ../bin/java/ 
    6869 
    6970distclean: clean 
  • gsdl/trunk/build-src/win32.mak

    r19520 r20873  
    3535MDEFINES = /f win32.mak 
    3636 
    37 INSTALLDIRS = src\hashfile src\phind\generate 
    38  
     37INSTALLDIRS = src\hashfile src\phind\generate  
     38JAVADIR = src\java\org\nzdl\gsdl 
    3939 
    4040MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" 
     
    5555MAKECLEANCMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" clean 
    5656 
    57 all: win32.mak $(INSTALLDIRS)  
     57all: win32.mak $(INSTALLDIRS) $(JAVADIR) 
    5858 
    5959install: win32.mak $(INSTALLDIRS) 
     
    6666    cd src\hashfile 
    6767    $(MAKECLEANCMD) 
     68    cd "$(BUILDHOME)" 
     69    cd src\java\org\nzdl\gsdl 
     70    call winMake.bat clean 
    6871    cd "$(GSDLHOME)" 
    6972 
     
    7578    cd "$(GSDLHOME)" 
    7679 
     80$(JAVADIR): FORCE 
     81    cd "$(BUILDHOME)" 
     82    cd "$@" 
     83    call winMake.bat all  
     84    if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java" 
     85    if EXIST "$(JAVADIR)\ApplyXSLT.jar" copy "$(JAVADIR)\ApplyXSLT.jar" "$(GSDLHOME)\bin\java" 
     86    @if NOT EXIST "$(JAVADIR)\ApplyXSLT.jar" echo Warning: Failed to find $(JAVADIR)\ApplyXSLT.jar.  Greenstone will not be able to use XSLT files during building 
     87     
     88              
     89 
    7790FORCE: 
    7891