Changeset 18070

Show
Ignore:
Timestamp:
04.12.2008 13:40:20 (11 years ago)
Author:
mdewsnip
Message:

Fixed up MORE consistency problems in Windows makefiles from source code splitting.

Location:
gsdl/trunk/common-src/src/gdbmedit
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/common-src/src/gdbmedit/db2txt/win32.mak

    r17876 r18070  
    2626 
    2727GSDLHOME = ..\..\..\.. 
    28 COMMONHOME = $(GSDLHOME)\common-src 
     28COMMON_DIR = $(GSDLHOME)\common-src 
    2929 
    3030GSDL_VC4 = 0 
    31 STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport" 
     31STLPATH = "$(COMMON_DIR)\packages\windows\stlport\stlport" 
    3232 
    3333AR = lib 
     
    4343 
    4444DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE 
    45 INCLUDES = -I"$(COMMONHOME)\src\gdbmedit\db2txt" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \ 
    46        -I"$(COMMONHOME)\packages\windows\gdbm\gdbm" 
     45INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\db2txt" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     46       -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" 
    4747!IF $(GSDL_VC4) 
    4848DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 
     
    5050!ENDIF 
    5151 
    52 LIBS = "$(COMMONHOME)\indexers\mg\lib\unitool.obj" "$(COMMONHOME)\src\lib\gsdllib.lib" \ 
    53        "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib" 
     52LIBS = "$(COMMON_DIR)\indexers\mg\lib\unitool.obj" "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 
     53       "$(COMMON_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" 
    5454 
    5555COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
  • gsdl/trunk/common-src/src/gdbmedit/gdbmget/win32.mak

    r17878 r18070  
    2626 
    2727GSDLHOME = ..\..\..\.. 
    28 COMMONHOME = $(GSDLHOME)\common-src 
     28COMMON_DIR = $(GSDLHOME)\common-src 
    2929 
    3030USE_STLPORT = 0 
    31 STLPATH = "$(COMMONHOME)packages\windows\stlport\stlport" 
     31STLPATH = "$(COMMON_DIR)packages\windows\stlport\stlport" 
    3232 
    3333AR = lib 
     
    3737 
    3838DEFS = -D__WIN32__ -DHAVE_CONFIG_H 
    39 INCLUDES = -I"$(COMMONHOME)\src\gdbmedit\gdbmget" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \ 
    40     -I"$(COMMONHOME)\packages\windows\gdbm\gdbm" 
     39INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmget" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     40    -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" 
    4141!IF $(USE_STLPORT) 
    4242DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 
     
    4444!ENDIF 
    4545 
    46 LIBS = "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib" 
     46LIBS = "$(COMMON_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" 
    4747 
    4848COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES) 
  • gsdl/trunk/common-src/src/gdbmedit/gdbmset/win32.mak

    r17878 r18070  
    2626 
    2727GSDLHOME = ..\..\..\.. 
    28 COMMONHOME = $(GSDLHOME)\common-src 
     28COMMON_DIR = $(GSDLHOME)\common-src 
    2929 
    3030USE_STLPORT = 0 
    31 STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport" 
     31STLPATH = "$(COMMON_DIR)\packages\windows\stlport\stlport" 
    3232 
    3333AR = lib 
     
    3737 
    3838DEFS = -D__WIN32__ -DHAVE_CONFIG_H 
    39 INCLUDES = -I"$(COMMONHOME)\src\gdbmedit\gdbmset" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \ 
    40     -I"$(COMMONHOME)\packages\windows\gdbm\gdbm" 
     39INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\gdbmset" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     40    -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" 
    4141!IF $(USE_STLPORT) 
    4242DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 
     
    4444!ENDIF 
    4545 
    46 LIBS = "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib" 
     46LIBS = "$(COMMON_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" 
    4747 
    4848COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES) 
  • gsdl/trunk/common-src/src/gdbmedit/txt2db/win32.mak

    r17877 r18070  
    2626 
    2727GSDLHOME = ..\..\..\.. 
    28 COMMONHOME = $(GSDLHOME)\common-src 
     28COMMON_DIR = $(GSDLHOME)\common-src 
    2929 
    3030GSDL_VC4 = 0 
    31 STLPATH = "$(COMMONHOME)\packages\windows\stlport\stlport" 
     31STLPATH = "$(COMMON_DIR)\packages\windows\stlport\stlport" 
    3232 
    3333AR = lib 
     
    4343 
    4444DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_CRT_SECURE_NO_DEPRECATE 
    45 INCLUDES = -I"$(COMMONHOME)\src\gdbmedit\txt2db" -I"$(COMMONHOME)\src\lib" -I"$(COMMONHOME)\indexers\mg\lib" \ 
    46        -I"$(COMMONHOME)\packages\windows\gdbm\gdbm" 
     45INCLUDES = -I"$(COMMON_DIR)\src\gdbmedit\txt2db" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\indexers\mg\lib" \ 
     46       -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" 
    4747!IF $(GSDL_VC4) 
    4848DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 
     
    5050!ENDIF 
    5151 
    52 LIBS = "$(COMMONHOME)\indexers\mg\lib\unitool.obj" "$(COMMONHOME)\src\lib\gsdllib.lib" \ 
    53        "$(COMMONHOME)\packages\windows\gdbm\gdbm\gdbm.lib" 
     52LIBS = "$(COMMON_DIR)\indexers\mg\lib\unitool.obj" "$(COMMON_DIR)\src\lib\gsdllib.lib" \ 
     53       "$(COMMON_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" 
    5454 
    5555COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)