Changeset 2338 for trunk/gsdl/src/recpt


Ignore:
Timestamp:
2001-04-25T22:29:11+12:00 (23 years ago)
Author:
sjboddie
Message:

Tidied up windows makefiles to make compiling under windows a little
easier.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/src/recpt/win32.mak

    r1154 r2338  
    2525###########################################################################
    2626
    27 GSDLHOME = c:\gsdl
    28 STLPATH = c:\stlport
     27GSDLHOME = ..\..
     28USE_STLPORT = 0
     29LOCAL_LIBRARY = 0
     30STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    2931
    3032AR = lib
     
    3234CPPFLAGS =
    3335LDFLAGS =
    34 DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
    35        -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \
    36        -DGSDLSERVER -DGSDLUSAGELOG 
    37 INCLUDES = -I$(GSDLHOME)\src\recpt -I$(GSDLHOME)\lib -I$(GSDLHOME)\src\colservr \
    38        -I$(GSDLHOME)\packages\mg -I$(GSDLHOME)\packages\mg\lib \
    39        -I$(GSDLHOME)\packages\mg\src\text -I$(GSDLHOME)\packages\wingdbm \
    40        -I$(STLPATH) -I$(GSDLHOME)\packages\wincrypt
     36DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX
     37INCLUDES = -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
     38       -I"$(GSDLHOME)\packages\mg" -I"$(GSDLHOME)\packages\mg\lib" \
     39       -I"$(GSDLHOME)\packages\mg\src\text" -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
     40       -I"$(GSDLHOME)\packages\windows\crypt\crypt"
     41!IF $(USE_STLPORT)
     42DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
     43INCLUDES = $(INCLUDES) -I$(STLPATH)
     44!ENDIF
     45!IF $(LOCAL_LIBRARY)
     46DEFS = $(DEFS) -DGSDL_LOCAL_LIBRARY
     47!ENDIF
    4148
    42 LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib $(GSDLHOME)\packages\wincrypt\crypt.lib
     49LIBS = "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib" \
     50       "$(GSDLHOME)\packages\windows\crypt\crypt\crypt.lib" \
     51       "$(GSDLHOME)\src\colservr\gsdlcolservr.lib" \
     52       "$(GSDLHOME)\lib\gsdllib.lib" \
     53       "$(GSDLHOME)\packages\mg\src\text\libtextin.lib" \
     54       "$(GSDLHOME)\packages\mg\lib\libmg.lib"
     55
    4356
    4457COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     
    5568
    5669
    57 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
     70COMMONHEADERS = receptionist.h cgiargs.h action.h browserclass.h \
    5871                converter.h recptconfig.h cgiutils.h OIDtools.h browsetools.h htmlgen.h \
    59         statusaction.h pageaction.h comtypes.h recptproto.h \
    60         pingaction.h queryaction.h documentaction.h \
    61         extlinkaction.h buildaction.h htmlutils.h \
     72        statusaction.h pageaction.h comtypes.h recptproto.h pingaction.h \
     73        queryaction.h documentaction.h extlinkaction.h htmlutils.h \
    6274        querytools.h formattools.h tipaction.h authenaction.h infodbclass.h \
    6375                userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \
    6476        datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
    65         htmlbrowserclass.h delhistoryaction.h historydb.h
     77        htmlbrowserclass.h historydb.h phindbrowserclass.h collectoraction.h \
     78        nullprtoto.h
    6679
    67 RECEPTHEADERS =
     80CGIHEADERS = cgiwrapper.h
    6881
    69 LIBRARYHEADERS = nullproto.h
    70 
    71 HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS)
     82HEADERS = $(COMMONHEADERS) $(CGIHEADERS)
    7283
    7384
    74 COMMONSOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp action.cpp browserclass.cpp \
     85COMMONSOURCES = receptionist.cpp cgiargs.cpp action.cpp browserclass.cpp \
    7586                converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetools.cpp \
    7687        htmlgen.cpp statusaction.cpp pageaction.cpp comtypes.cpp \
    7788        recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \
    78         extlinkaction.cpp buildaction.cpp htmlutils.cpp querytools.cpp formattools.cpp \
     89        extlinkaction.cpp htmlutils.cpp querytools.cpp formattools.cpp \
    7990        tipaction.cpp authenaction.cpp infodbclass.cpp userdb.cpp usersaction.cpp \
    8091        vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \
    8192        invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
    82         delhistoryaction.cpp historydb.cpp
     93        historydb.cpp phindbrowserclass.cpp collectoraction.cpp nullproto.cpp
     94
     95CGISOURCES = librarymain.cpp cgiwrapper.cpp
     96
     97SOURCES = $(COMMONSOURCES) $(CGISOURCES)
    8398
    8499
    85 RECPTSOURCES = recptmain.cpp
     100COMMONOBJECTS = receptionist.obj cgiargs.obj action.obj browserclass.obj \
     101                converter.obj recptconfig.obj cgiutils.obj OIDtools.obj browsetools.obj \
     102        htmlgen.obj statusaction.obj pageaction.obj comtypes.obj recptproto.obj \
     103        pingaction.obj queryaction.obj documentaction.obj extlinkaction.obj \
     104        htmlutils.obj querytools.obj formattools.obj tipaction.obj \
     105        authenaction.obj infodbclass.obj userdb.obj usersaction.obj \
     106        vlistbrowserclass.obj hlistbrowserclass.obj datelistbrowserclass.obj \
     107        invbrowserclass.obj pagedbrowserclass.obj htmlbrowserclass.obj \
     108        historydb.obj phindbrowserclass.obj collectoraction.obj nullproto.obj
    86109
    87 LIBRARYSOURCES = nullproto.cpp librarymain.cpp
     110CGIOBJECTS = librarymain.obj cgiwrapper.obj
    88111
    89 SOURCES = $(COMMONSOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES)
     112OBJECTS = $(COMMONOBJECTS) $(CGIOBJECTS)
    90113
     114EXEC = library.exe
    91115
    92 COMMONOBJECTS = receptionist.obj cgiwrapper.obj cgiargs.obj action.obj browserclass.obj \
    93                 converter.obj recptconfig.obj cgiutils.obj OIDtools.obj browsetools.obj \
    94         htmlgen.obj statusaction.obj pageaction.obj comtypes.obj \
    95         recptproto.obj pingaction.obj queryaction.obj documentaction.obj \
    96         extlinkaction.obj buildaction.obj htmlutils.obj querytools.obj \
    97         formattools.obj tipaction.obj authenaction.obj \
    98                 infodbclass.obj userdb.obj usersaction.obj vlistbrowserclass.obj \
    99         hlistbrowserclass.obj datelistbrowserclass.obj invbrowserclass.obj \
    100         pagedbrowserclass.obj htmlbrowserclass.obj delhistoryaction.obj \
    101         historydb.obj
     116!IF $(LOCAL_LIBRARY)
     117all: gsdlrecpt.lib
     118!ELSE
     119all: $(EXEC)
     120!ENDIF
    102121
    103 RECPTOBJECTS = recptmain.obj
    104 
    105 LIBRARYOBJECTS = nullproto.obj librarymain.obj
    106 
    107 OBJECTS = $(COMMONOBJECTS) $(RECPTOBJECTS) $(LIBRARYOBJECTS)
    108 
    109 
    110 COLSERVROBJECTS = $(GSDLHOME)\src\colservr\mgq.obj \
    111                   $(GSDLHOME)\src\colservr\mgsearch.obj \
    112                   $(GSDLHOME)\src\colservr\querycache.obj \
    113                   $(GSDLHOME)\src\colservr\queryinfo.obj \
    114                   $(GSDLHOME)\src\colservr\collectserver.obj \
    115                   $(GSDLHOME)\src\colservr\colservrconfig.obj \
    116                   $(GSDLHOME)\src\colservr\maptools.obj \
    117                   $(GSDLHOME)\src\colservr\filter.obj \
    118                   $(GSDLHOME)\src\colservr\source.obj \
    119                   $(GSDLHOME)\src\colservr\browsefilter.obj \
    120                   $(GSDLHOME)\src\colservr\queryfilter.obj \
    121                   $(GSDLHOME)\src\colservr\mggdbmsource.obj \
    122                   $(GSDLHOME)\src\colservr\phrasesearch.obj \
    123                   $(GSDLHOME)\src\colservr\phrasequeryfilter.obj
    124 
    125 EXEC = recpt.exe library.exe
    126 
    127 all: $(EXEC)
     122gsdlrecpt.lib : $(COMMONOBJECTS)
     123    if EXIST gsdlrecpt.lib del gsdlrecpt.lib
     124    $(AR) /out:gsdlrecpt.lib $(COMMONOBJECTS)
    128125
    129126clean:
    130127    del *.obj
    131     del recpt.exe
    132128    del library.exe
    133129
     130!IF $(LOCAL_LIBRARY)
    134131install:
    135     copy library.exe $(GSDLHOME)\cgi-bin\library.exe
     132!ELSE
     133install:
     134    copy library.exe "$(GSDLHOME)\cgi-bin"
     135!ENDIF
    136136
    137 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
     137library.exe: $(OBJECTS)
     138         $(LINK) $(OBJECTS) $(LIBS)
    138139
    139 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
    140     $(GSDLHOME)\lib\gsdllib.lib  \
    141     $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
    142     $(GSDLHOME)\packages\mg\lib\libmg.lib
     140# we want statusaction to always be compiled in case the status of
     141# GSDL_LOCAL_LIBRARY has changed
     142statusaction.obj: FORCE
    143143
    144 recpt.exe: $(RECPT_OBJS)
    145            $(LINK) $(RECPT_OBJS) $(LIBS)
    146 
    147 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    148 
    149 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
    150     $(GSDLHOME)\lib\gsdllib.lib \
    151     $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
    152     $(GSDLHOME)\packages\mg\lib\libmg.lib
    153 
    154 library.exe: $(LIBRARY_OBJS)
    155          $(LINK) $(LIBRARY_OBJS) $(LIBS)
     144FORCE:
Note: See TracChangeset for help on using the changeset viewer.