Changeset 15526

Show
Ignore:
Timestamp:
16.05.2008 10:46:54 (12 years ago)
Author:
mdewsnip
Message:

Various consistency improvements.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/lib/win32.mak

    r15514 r15526  
    2525########################################################################### 
    2626 
    27 GSDLHOME = .. 
     27GSDL_DIR = .. 
     28INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29 
     30 
    2831GSDL_VC4 = 0 
    2932LOCAL_LIBRARY = 0 
    3033DLL = 0 
    3134DLLDEBUG = 0 
    32 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 
     35STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
    3336 
    3437 
     
    5255DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \ 
    5356       -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    54 INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\indexers\mg\lib" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" 
     57INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" 
     58 
    5559!IF $(GSDL_VC4) 
    5660DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 
     
    107111    text_t.obj 
    108112 
     113LIBRARY = gsdllib.lib    
    109114 
    110 all: gsdllib.lib 
    111115 
    112116gsdllib.lib : $(OBJECTS) 
     
    114118    $(AR) -nologo /out:gsdllib.lib $(OBJECTS) 
    115119 
    116 # we want gsdltools to always be compiled in case the status of 
    117 # GSDL_LOCAL_LIBRARY has changed 
    118 gsdltools.obj: FORCE 
     120all: $(LIBRARY) 
     121 
     122install: $(LIBRARY) 
    119123 
    120124clean: 
     
    122126    del gsdllib.lib 
    123127 
    124 install: 
     128 
     129# Always recompile gsdltools in case GSDL_LOCAL_LIBRARY has changed 
     130gsdltools.obj: FORCE 
    125131 
    126132FORCE: