Changeset 28403

Show
Ignore:
Timestamp:
14.10.2013 10:14:56 (6 years ago)
Author:
davidb
Message:

Support for compiling from Cygwin added

Location:
main/trunk/greenstone2/common-src/src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/src/getpw/Makefile.in

    r26822 r28403  
    3232DEFS = @DEFS@ 
    3333GSDLOS = @gsdlos@ 
     34UNAME := $(shell uname -o) 
    3435INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_DIR)/src/lib 
    3536STRIP   = @STRIP@ 
     
    6061 
    6162ifeq ($(GSDLOS),windows) 
    62   # e.g. we are cross-compiling with mingw under Linux 
    63   SOURCES += crypt.c crypt_util.c getpass.c 
     63  ifneq ($(UNAME),Cygwin)  
     64    # e.g. we are cross-compiling with mingw under Linux  
     65    SOURCES += crypt.c crypt_util.c getpass.c 
     66  endif 
    6467endif 
    6568 
     
    7275 
    7376ifeq ($(GSDLOS),windows) 
    74   # e.g. we are cross-compiling with mingw under Linux 
    75   OBJECTS += crypt.o crypt_util.o getpass.o 
     77  ifneq ($(UNAME),Cygwin) 
     78    # e.g. we are cross-compiling with mingw under Linux 
     79    OBJECTS += crypt.o crypt_util.o getpass.o 
     80  endif 
    7681endif 
    7782 
  • main/trunk/greenstone2/common-src/src/jdbmedit/Makefile.in

    r28370 r28403  
    2121 
    2222%.class: %.java 
    23 ifeq ($(GSDLOS), "windows") 
     23ifeq ($(GSDLOS),windows) 
    2424# for cygwin with a native Windows java compiler 
    2525    $(JAVAC) $(JAVACFLAGS) -classpath "$(JDBM_JAR);." $<