Changeset 26648

Show
Ignore:
Timestamp:
10.01.2013 15:20:59 (6 years ago)
Author:
davidb
Message:

Updates to Makefile.in to include compilation of open-source code that implements the crypt() algorithm to make Greenstone code more portable. Motivation for adding this in came from work with cross-compiling (using mingw under Ubuntu for generating Windows native binaries). Some adjustment (tidying up some sloppy statements that blurred the distinction between C and C++ code really) of the Makefile was also needed to accomodate compiling with mingw

Files:
1 modified

Legend:

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

    r25149 r26648  
    2727COMMON_DIR = $(GSDL_DIR)/common-src 
    2828 
     29CC = @CC@ 
    2930CXX = @CXX@ 
    3031CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@ 
    3132DEFS = @DEFS@ 
    3233GSDLOS = @gsdlos@ 
    33 INCLUDES = -I$(COMMON_DIR) -I$(COMMON_DIR)/src/lib 
     34INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_DIR)/src/lib 
    3435INSTALL = @INSTALL@ 
    3536LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@ 
     
    3738 
    3839 
     40CCOMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) 
    3941CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 
    4042CXXLINK = $(CXX) $(LDFLAGS) -o $@ 
    4143 
    4244 
    43 .SUFFIXES: 
    44 .SUFFIXES: .cpp .o 
    45 .cpp.o: 
     45#.SUFFIXES: 
     46#.SUFFIXES: .cpp .o 
     47#.cpp.o: 
     48#   $(CXXCOMPILE) $<  
     49 
     50%.o: %.cpp 
    4651    $(CXXCOMPILE) $<  
     52 
     53%.o: %.c 
     54    $(CCOMPILE) $<  
    4755 
    4856 
    4957SOURCES = \ 
    50     getpw.cpp 
     58    getpw.cpp crypt.c crypt_util.c getpass.c 
    5159 
    5260OBJECTS = \ 
    53     getpw.o 
     61    getpw.o crypt.o crypt_util.o getpass.o 
    5462 
    5563EXECUTABLE_OBJECTS = \