Changeset 19875

Show
Ignore:
Timestamp:
22.06.2009 13:52:35 (11 years ago)
Author:
kjdon
Message:

making common-src compile independently of gsdl or gs2build (for gs3) so modified makefiles to look for things in common-src dir rather than one level up

Location:
gsdl/trunk/common-src/src
Files:
5 modified

Legend:

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

    r16615 r19875  
    3131DEFS = @DEFS@ 
    3232GSDLOS = @gsdlos@ 
    33 INCLUDES = -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib 
     33INCLUDES = -I$(COMMON_DIR) -I$(COMMON_DIR)/src/lib 
    3434INSTALL = @INSTALL@ 
    3535LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 
  • gsdl/trunk/common-src/src/getpw/win32.mak

    r19523 r19875  
    2525########################################################################### 
    2626 
    27 GSDL_DIR = ..\..\.. 
    28 COMMON_DIR = $(GSDLHOME)\common-src 
     27COMMON_DIR = ..\.. 
    2928 
    3029COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 
     
    6160CC = cl 
    6261DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    63 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\packages\windows\crypt\crypt" 
     62INCLUDES = -I"$(COMMON_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\packages\windows\crypt\crypt" 
    6463LIBS = "$(COMMON_DIR)\src\lib\gsdllib.lib" "$(COMMON_DIR)\packages\windows\crypt\crypt\crypt.lib" 
    6564 
  • gsdl/trunk/common-src/src/lib/Makefile.in

    r18224 r19875  
    2525########################################################################### 
    2626 
    27 GSDL_DIR = ../../.. 
    28 COMMON_DIR = $(GSDL_DIR)/common-src 
     27#GSDL_DIR = ../../.. 
     28COMMON_DIR = ../../ 
    2929 
    3030INDEXERS_DIR = $(COMMON_DIR)/indexers 
     
    4848CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 
    4949DEFS = @DEFS@ 
    50 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES) 
     50INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES) 
    5151RANLIB = @RANLIB@ 
    5252 
  • gsdl/trunk/common-src/src/lib/gsdlconf.h

    r19205 r19875  
    3737 
    3838#if defined(__WIN32__) && !defined(__CYGWIN__) 
    39 #include "../../../win32cfg.h" 
     39#include "../../win32cfg.h" 
    4040#else 
    41 #include "../../../config.h" 
     41#include "../../config.h" 
    4242#endif 
    4343 
  • gsdl/trunk/common-src/src/lib/win32.mak

    r19523 r19875  
    2525########################################################################### 
    2626 
    27 GSDL_DIR = ..\..\.. 
    28 COMMON_DIR = $(GSDLHOME)\common-src 
     27COMMON_DIR = ..\.. 
    2928 
    3029INDEXERS_DIR = $(COMMON_DIR)\indexers 
     
    8382CC = cl 
    8483DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    85 INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" \ 
     84INCLUDES = -I"$(COMMON_DIR)" -I"$(INDEXERS_DIR)\mg\lib" \ 
    8685    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 
    8786    $(SQLITE_INCLUDES)