Changeset 1000


Ignore:
Timestamp:
2000-03-02T11:23:47+13:00 (23 years ago)
Author:
sjboddie
Message:

tidied up windows installation

Location:
trunk/gsdl
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/lib/gsdltools.h

    r991 r1000  
    3030#define GSDLTOOLS_H
    3131
     32// don't actually use this but some windows
     33// versions of STL complain about use of
     34// bool keyword without it
     35#include "text_t.h"
     36
    3237// returns true if machine is little endian
    3338bool littleEndian();
  • trunk/gsdl/lib/win32.mak

    r743 r1000  
    2525###########################################################################
    2626
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
     29
    2730AR = lib
    2831CC = cl
    2932CPPFLAGS =
    30 DEFS = -DQUIET -D__WIN32__ -D_LITTLE_ENDIAN -DGSDL_NAMESPACE_BROKEN \
     33DEFS = -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
    3134    -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS
    32 INCLUDES = -I../packages/mg/lib -I f:\STLport-3.2\stlport
     35INCLUDES = -I$(GSDLHOME)\packages\mg\lib -I$(STLPATH)
    3336
    3437COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     
    4346    $(COMPILE) $<
    4447
    45 
    4648HEADERS = \
    4749  cfgread.h      fileutil.h     gsdlunicode.h  text_t.h \
    48   display.h      gsdlconf.h     gsdltimes.h
     50  display.h      gsdlconf.h     gsdltimes.h    gsdltools.h
    4951
    5052SOURCES = \
    5153  cfgread.cpp      fileutil.cpp     text_t.cpp \
    52   display.cpp      gsdlunicode.cpp  gsdltimes.cpp
     54  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp
    5355
    5456OBJECTS = \
    5557  cfgread.obj        fileutil.obj       text_t.obj   \
    56   display.obj        gsdlunicode.obj    gsdltimes.obj
     58  display.obj        gsdlunicode.obj    gsdltimes.obj  gsdltools.obj
    5759
    5860all: gsdllib.lib
    5961
    60 GSDLLIBOBJECTS = $(OBJECTS)
    61 
    62 gsdllib.lib : $(GSDLLIBOBJECTS)
     62gsdllib.lib : $(OBJECTS)
    6363    del gsdllib.lib
    64     $(AR) /out:gsdllib.lib $(GSDLLIBOBJECTS)
     64    $(AR) /out:gsdllib.lib $(OBJECTS)
    6565
    6666clean:
  • trunk/gsdl/packages/mg/lib/WIN32.MAK

    r439 r1000  
    1 # Generated automatically from Makefile.in by configure.
    21###########################################################################
    32#
    4 # Makefile.in -- Makefile for the general purpose library
    5 # Copyright (C) 1994  Neil Sharman; (C) 1995 Tim Shimmin
     3# win32 makefile -- mg\lib
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
    610#
    711# This program is free software; you can redistribute it and/or modify
     
    1923# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2024#
    21 #       @(#)Makefile.in 1.3 16 Mar 1994
    22 #
    2325###########################################################################
     26 
     27GSDLHOME = d:\home\dl\gsdl
    2428
    25 
    26 PACKAGE = mg
    27 VERSION = 1.2
    28  
    2929AR = lib
    3030CC = cl
    31 #CFLAGS = -g -O
    3231CPPFLAGS =
     32
    3333DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
    34  
    35 COMPILE = $(CC) -c $(DEFS) -I. -I..
     34INCLUDES = -I$(GSDLHOME)\packages\mg\lib -I$(GSDLHOME)\packages\mg
     35
     36COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
    3637 
    3738.SUFFIXES:
     
    4243ANSI2KNR =
    4344o = .obj
    44  
    45  
    46 INCLUDES = -I..
    4745 
    4846HEADERS = \
     
    5755
    5856SOURCES = \
    59     bitio_random.c    mgheap.c            memlib.c \
     57    bitio_random.c    mgheap.c          memlib.c \
    6058    bitio_stdio.c     huffman.c         messages.c \
    6159    bitio_gen.c       filestats.c       huffman_mem.c     perf_hash.c \
     
    8684    $(AR) /out:libmg.lib $(OBJECTS)
    8785
    88 $(OBJECTS): ..\win32cfg.h
     86$(OBJECTS): $(GSDLHOME)\packages\mg\win32cfg.h
    8987
    9088install:
    91 installdirs:
    92 uninstall:
    93 execinstall:
    94 execuninstall:
    95 maninstall:
    96 manuninstall:
    97  
    98 #dist: $(DISTFILES)
    99 #        for file in $(DISTFILES); do \
    100 #          ln $$file $(distdir) 2> /dev/null \
    101 #         || cp -p $$file $(distdir); \
    102 #       done
    103 
    104 mostlyclean:
    105     del *.obj
    106  
    107 clean: mostlyclean
     89clean:
     90    del *$o
    10891    del libmg.lib
    109  
    110 distclean: clean
    111     rm -f Makefile
    112  
    113 maintainer-clean: distclean
    114     @echo "This command is intended only for maintainers to use;"
    115     @echo "rebuilding the deleted files may require special tools."
    116 
    117 #Makefile: Makefile.in ../config.status
    118 #        cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    119  
    120 # Tell versions [3.59,3.63) of GNU make not to export all variables.
    121 # Otherwise a system limit (for SysV at least) may be exceeded.
    122 #.NOEXPORT:
  • trunk/gsdl/packages/mg/lib/xmalloc.c

    r795 r1000  
    5656int xmalloc_exit_failure = EXIT_FAILURE;
    5757
     58#if defined(__WIN32__)
     59void error (int, int, const char *, ...);
     60#else
    5861#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
    5962void error (int, int, const char *, ...);
     
    6164void error (int, int, char *, char *, char *, char *, char *, char *, char *, char *, char *);
    6265#endif
     66#endif;
    6367
    6468static VOID *
  • trunk/gsdl/packages/mg/src/text/WIN32.MAK

    r439 r1000  
    1 #PACKAGE = mg
    2 #VERSION = 1.3
    3 
    4 #SHELL = /bin/sh
    5 #exec_prefix = ${prefix}
    6 #prefix = /image/httpd/mg-1.2
    7 #srcdir = .
    8 #subdir = src/text
    9 #top_srcdir = ../..
    10 #transform = s,x,x,
     1###########################################################################
     2#
     3# win32 makefile -- mg\src\text
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     24#
     25###########################################################################
     26
     27GSDLHOME = d:\home\dl\gsdl
    1128
    1229CC = cl
    13 #CC = cl /Z7  this gives symbol and line number debugging (set /DEBUG on link)
    14 #CFLAGS = -g -O
    1530CPPFLAGS =
    16 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
    17 #INSTALL = /usr/local/gnu/bin/install -c
    18 #INSTALL_DATA = ${INSTALL} -m 644
    19 #INSTALL_PROGRAM = ${INSTALL}
     31DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H \
     32       -D__WIN32__ -D_LITTLE_ENDIAN
     33INCLUDES = -I$(GSDLHOME)\packages\mg\src\text -I$(GSDLHOME)\packages\mg \
     34       -I$(GSDLHOME)\packages\mg\lib
    2035LDFLAGS =
    21 LIBS = ..\..\lib\libmg.lib
    22 #TOUCH = echo timestamp >
    23 #AWK = gawk
    24 
    25 #bindir = $(exec_prefix)/bin
    26 #datadir = $(prefix)/share
    27 #libexecdir = $(exec_prefix)/libexec
    28 #localedir = $(datadir)/locale
    29 #mandir = $(prefix)/man/man1
    30 
    31 COMPILE = $(CC) -c $(DEFS) -I. -I..\.. -I..\..\lib
     36
     37LIBS = $(GSDLHOME)\packages\mg\lib\libmg.lib
     38
     39COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
    3240LINK = $(CC) $(LDFLAGS)
    3341
     
    4149o = .obj
    4250e = .exe
    43 
    44 #############################################################################
    45 #
    46 # Uncomment (and possibly edit) the following lines if you wish
    47 # to use the GNU readline library for the input in mgquery
    48 #
    49 #READLINE = -DGNU_READLINE -I/opt/gnu/include/readline -L/opt/gnu/lib
    50 #READLINE_LIBS = -lreadline -ltermcap
    51 #
    52 #
    53 #############################################################################
    54 
    55 #############################################################################
    56 #
    57 # When working with the trec collection this should be uncommented.
    58 #
    59 # TREC_MODE = -DTREC_MODE
    60 #
    61 #
    62 #############################################################################
    6351
    6452SOURCES = \
     
    9078  comp_dict.h        lists.h            stemmer.h          query_term_list.h
    9179
    92 
    93 #MISC          = Makefile.in help.mg.src bool_parser.y warranty.src conditions.src
    94 
    95 ALLFILES      = $(SOURCES) $(HEADERS) $(MISC) $(MAN)
    96 
    97 DISTFILES     = $(ALLFILES)
    98 
    9980EXEC          = mgquery$e mg_weights_build$e mgstat$e \
    10081        mg_invf_dump$e     mg_invf_dict$e \
     
    10889                mg_decompress_text$e
    10990
    110 MAN           = mgquery.1 mg_weights_build.1 mgstat.1 mg_invf_dump.1 mg_invf_dict.1 \
    111         mg_invf_rebuild.1 mgdictlist.1 mg_passes.1 mg_perf_hash_build.1 \
    112         mg_compression_dict.1 mg_text_estimate.1 mg_fast_comp_dict.1 \
    113         mg_hilite_words.1 mg_invf_merge.1 mg_text_merge.1 \
    114         mg_stem_idx.1 mgstemidxlist.1 mg_decompress_text.1
    115 
    116 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    117 
    118 
    11991all:    $(EXEC) libtextin.lib
    12092
    121 
    122 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    123 
    124 #help.mg.h : help.mg.src
    125 #        sed -e 's/\\/\\\\/g' -e 's/\"/\\\"/g' help.mg.src | $(AWK) '/^#/ { next; };{ if (x == 0) printf("static char *help_str[] = {\n\"%s\\n\"", $$0); else printf(",\n\"%s\\n\"", $$0); x = 1; }; END { printf("};\n"); }' - >help.mg.h
    126 
    127 #warranty.h : warranty.src
    128 #        sed  -e 's/\\/\\\\/g' -e 's/\"/\\\"/g' warranty.src | $(AWK) '/^#/ { next; };{ if (x == 0) printf("static char *warranty_str[] = {\n\"%s\\n\"", $$0); else printf(",\n\"%s\\n\"", $$0); x = 1; }; END { printf("};\n"); }' - >warranty.h
    129 
    130 #conditions.h : conditions.src
    131 #        sed -e 's/\\/\\\\/g' -e 's/\"/\\\"/g' conditions.src | $(AWK) '/^#/ { next; };{ if (x == 0) printf("static char *cond_str[] = {\n\"%s\\n\"", $$0); else printf(",\n\"%s\\n\"", $$0); x = 1; }; END { printf("};\n"); }' - >conditions.h
    132 
    133 
    134 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    135 
    13693HILITE_OBJS = mg_hilite_words$o stemmer$o locallib$o words$o
    137 
    13894mg_hilite_words$e: $(HILITE_OBJS)
    13995    $(LINK) $(HILITE_OBJS) $(LIBS)
    14096
    141 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    142 
    143 #bool_parser.c: bool_parser.y
    144 #        $(YACC) $?
    145 #        mv y.tab.c $@
    146 #
    14797BOOL_OBJS = bool_tree$o bool_parser$o bool_optimiser$o bool_tester$o \
    14898        term_lists$o stemmer$o stem_search$o mg_errors$o query_term_list$o \
    14999        words$o
    150 
    151100bool_tester$e: $(BOOL_OBJS)
    152101    $(LINK) $(BOOL_OBJS) $(LIBS)
    153 
    154 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    155102
    156103QUERY_OBJS = \
     
    161108    term_lists$o bool_tree$o bool_parser$o bool_optimiser$o bool_query$o \
    162109    query_term_list$o words$o
    163 
    164110mgquery$e: $(QUERY_OBJS)
    165111    $(LINK) $(READLINE) $(QUERY_OBJS) $(READLINE_LIBS) $(LIBS)
    166112
    167113commands$o : help.mg.h warranty.h conditions.h
    168 
    169 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    170114
    171115PASSES_OBJS = \
     
    174118    ivf.pass1$o ivf.pass2$o mg.special$o mg_files$o \
    175119    words$o
    176 
    177120mg_passes$e: $(PASSES_OBJS)
    178121    $(LINK) $(PASSES_OBJS) $(LIBS)
    179 
    180 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    181122
    182123PASS_OBJS = \
     
    184125    text.pass2$o locallib$o \
    185126    ivf.pass1$o ivf.pass2$o mg.special$o mg_files$o
    186 
    187 #mgpass$o:  mgpass.cpp
    188 #   $(COMPILE) mgpass.cpp
    189 
    190127mgpass$e: $(PASS_OBJS)
    191128    $(LINK) $(PASS_OBJS) $(LIBS)
    192 
    193 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    194129
    195130LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
     
    199134BUILDER_OBJS = \
    200135    builder$o
    201 
    202136builder$e: $(BUILDER_OBJS)
    203137    $(LINK) $(BUILDER_OBJS) $(LIBS) $(LINK32_FLAGS)
    204138
    205 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    206 
    207139WEIGHTS_BUILD_OBJS = mg_weights_build$o mg_files$o
    208 
    209140mg_weights_build$e: $(WEIGHTS_BUILD_OBJS)
    210141    $(LINK) $(WEIGHTS_BUILD_OBJS) $(LIBS)
    211142
    212143COMP_DICT_OBJS = mg_compression_dict$o mg_files$o locallib$o
    213 
    214144mg_compression_dict$e: $(COMP_DICT_OBJS)
    215145    $(LINK) $(COMP_DICT_OBJS) $(LIBS)
    216146
    217147FAST_COMP_OBJS = mg_fast_comp_dict$o mg_files$o locallib$o
    218 
    219148mg_fast_comp_dict$e: $(FAST_COMP_OBJS)
    220149    $(LINK) $(FAST_COMP_OBJS) $(LIBS)
    221150
    222151TEXT_EST_OBJS = mg_text_estimate$o locallib$o comp_dict$o mg_files$o
    223 
    224152mg_text_estimate$e: $(TEXT_EST_OBJS)
    225153    $(LINK) $(TEXT_EST_OBJS) $(LIBS)
    226154
    227155STAT_OBJS = mgstat$o mg_files$o locallib$o
    228 
    229156mgstat$e: $(STAT_OBJS)
    230157    $(LINK) $(STAT_OBJS) $(LIBS)
    231158
    232159INVF_DUMP_OBJS = mg_invf_dump$o locallib$o mg_files$o
    233 
    234160mg_invf_dump$e: $(INVF_DUMP_OBJS)
    235161    $(LINK) $(INVF_DUMP_OBJS) $(LIBS)
    236162
    237163INVF_DICT_OBJS = mg_invf_dict$o mg_files$o locallib$o
    238 
    239164mg_invf_dict$e: $(INVF_DICT_OBJS)
    240165    $(LINK) $(INVF_DICT_OBJS) $(LIBS)
    241166
    242167INVF_REB_OBJS = mg_invf_rebuild$o locallib$o
    243 
    244168mg_invf_rebuild$e: $(INVF_REB_OBJS)
    245169    $(LINK) $(INVF_REB_OBJS) $(LIBS)
    246170
    247171DICTLIST_OBJS = mgdictlist$o locallib$o
    248 
    249172mgdictlist$e: $(DICTLIST_OBJS)
    250173    $(LINK) $(DICTLIST_OBJS) $(LIBS)
    251174
    252175PERF_HASH_OBJS = mg_perf_hash_build$o mg_files$o
    253 
    254176mg_perf_hash_build$e: $(PERF_HASH_OBJS)
    255177    $(LINK) $(PERF_HASH_OBJS) $(LIBS)
     
    257179STEM_IDX_OBJS = mg_stem_idx$o mg_files$o stemmer$o locallib$o \
    258180                mg_errors$o term_lists$o
    259 
    260181mg_stem_idx$e: $(STEM_IDX_OBJS)
    261182    $(LINK) $(STEM_IDX_OBJS) $(LIBS)
    262183
    263184STEM_IDX_LIST_OBJS = mgstemidxlist$o mg_files$o
    264 
    265185mgstemidxlist$e: $(STEM_IDX_LIST_OBJS)
    266186    $(LINK) $(STEM_IDX_LIST_OBJS) $(LIBS)
     
    269189                       text_get$o locallib$o backend$o stem_search$o \
    270190                       term_lists$o stemmer$o weights$o invf_get$o lists$o
    271 
    272191mg_decompress_text$e: $(DECOMPRESS_TEXT_OBJS)
    273192    $(LINK) $(DECOMPRESS_TEXT_OBJS) $(LIBS)
    274193
    275 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    276 
    277194TEXT_MERGE_OBJS = mg_text_merge$o mg_files$o locallib$o
    278 
    279195mg_text_merge$e: $(TEXT_MERGE_OBJS)
    280196    $(LINK) $(TEXT_MERGE_OBJS) $(LIBS)
    281197
    282198INVF_MERGE_OBJS = mg_invf_merge$o mg_files$o locallib$o
    283 
    284199mg_invf_merge$e: $(INVF_MERGE_OBJS)
    285200    $(LINK) $(INVF_MERGE_OBJS) $(LIBS)
    286201
    287 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    288 
    289 #ansi2knr: ansi2knr.o
    290 #        $(LINK) ansi2knr.o $(LIBS)
    291 #
    292 install: execinstall maninstall
    293 uninstall: execuninstall manuninstall
    294 
    295 #execinstall: $(EXEC)
    296 #        $(top_srcdir)/mkinstalldirs $(bindir); \
    297 #        for name in $(EXEC); do \
    298 #          $(INSTALL_PROGRAM) $$name \
    299 #          $(bindir)/`echo $$name | sed '$(transform)'`; \
    300 #        done
    301 
    302 #execuninstall:
    303 #        for name in $(EXEC); do \
    304 #         rm -f $(bindir)/`echo $$name | sed '$(transform)'`; \
    305 #        done
    306 
    307 maninstall: $(MAN)
    308     $(top_srcdir)/mkinstalldirs $(mandir); \
    309     for f in $(MAN); do \
    310       $(INSTALL_DATA) $$f $(mandir)/$$f ;\
    311     done
    312 
    313 manuninstall: $(MAN)
    314     for f in $(MAN); do \
    315       rm -f $(mandir)/$$f ;\
    316     done
    317 
     202install:
     203    if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows
     204    for %%i in ($(EXEC)) do \
     205      copy %%i $(GSDLHOME)\bin\windows
    318206
    319207LIB_OBJS = \
     
    330218    lib /out:libtextin.lib $(LIB_OBJS)
    331219
    332 
    333 mostlyclean:
    334     rm -f *$o _*.c _*.o *._c *._o core core.*
    335  
    336 clean: mostlyclean
    337     rm -f $(EXEC)
    338  
    339 distclean: clean
    340     rm -f ansi2knr
    341     rm -f Makefile
    342  
    343 maintainer-clean: distclean
    344     @echo "This command is intended only for maintainers to use;"
    345     @echo "rebuilding the deleted files may require special tools."
    346  
    347 #dist: $(DISTFILES)
    348 #        for file in $(DISTFILES); do \
    349 #          ln $(srcdir)/$$file $(distdir) 2> /dev/null \
    350 #          || cp -p $(srcdir)/$$file $(distdir); \
    351 #        done
    352  
    353 #Makefile: Makefile.in ../../config.status
    354 #        cd ../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
    355  
    356 # Tell versions [3.59,3.63) of GNU make not to export all variables.
    357 # Otherwise a system limit (for SysV at least) may be exceeded.
    358 #.NOEXPORT:
     220clean:
     221    del *$o
     222    del $(EXEC)
  • trunk/gsdl/packages/wingdbm/win32.mak

    r774 r1000  
     1###########################################################################
     2#
     3# win32 makefile -- wingdbm
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     24#
     25###########################################################################
    126
    2 #srcdir = c:\home\rjmcnab\humanity\gdbm
    3 srcdir = d:\gsdl\packages\wingdbm
    4 VPATH = $(srcdir)
     27GSDLHOME = d:\home\dl\gsdl
     28srcdir = $(GSDLHOME)\packages\wingdbm
    529
    630AR = lib
    731CC = cl
    8 #CFLAGS = -g -O
    932CPPFLAGS =
    10 DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN
     33DEFS = -D__WIN32__
    1134LDFLAGS =
    1235
     
    2245    $(COMPILE) $<
    2346
     47HEADERS = gdbmdefs.h extern.h gdbmerrno.h systems.h gdbmconst.h \
     48          proto.h
    2449
    25 PROGS = gdbm.lib testgdbm.exe
     50SOURCES = gdbmopen.c gdbmdelete.c gdbmfetch.c  gdbmstore.c gdbmclose.c \
     51      gdbmreorg.c gdbmseq.c gdbmsync.c gdbmerrno.c gdbmexists.c gdbmsetopt.c \
     52      bucket.c falloc.c findkey.c global.c hash.c update.c \
     53      version.c alloca.c
    2654
    27 GDBM_CF = gdbmopen.c gdbmdelete.c gdbmfetch.c  gdbmstore.c gdbmclose.c \
    28     gdbmreorg.c gdbmseq.c gdbmsync.c gdbmerrno.c gdbmexists.c gdbmsetopt.c \
    29     bucket.c falloc.c findkey.c global.c hash.c update.c \
    30     version.c alloca.c
    31 
    32 TEST_CF = testgdbm.c
    33 
    34 GDBM_OF = gdbmopen$o gdbmdelete$o gdbmfetch$o  gdbmstore$o gdbmclose$o \
    35     gdbmreorg$o gdbmseq$o gdbmsync$o gdbmerrno$o gdbmexists$o gdbmsetopt$o \
    36     bucket$o falloc$o findkey$o global$o hash$o update$o \
    37     version$o alloca$o
    38      
    39 SRCS = $(GDBM_CF) $(TEST_CF)
    40 
    41 OBJS = $(GDBM_OF)
    42 
    43 HDRS = gdbmdefs.h extern.h gdbmerrno.h systems.h gdbmconst.h \
    44     proto.h
     55OBJECTS = gdbmopen$o gdbmdelete$o gdbmfetch$o  gdbmstore$o gdbmclose$o \
     56      gdbmreorg$o gdbmseq$o gdbmsync$o gdbmerrno$o gdbmexists$o gdbmsetopt$o \
     57      bucket$o falloc$o findkey$o global$o hash$o update$o \
     58      version$o alloca$o
    4559
    4660all: gdbm.lib
    4761
    48 progs: $(PROGS)
     62gdbm.lib: $(OBJECTS) gdbm.h
     63      del gdbm.lib
     64      $(AR) /out:gdbm.lib $(OBJECTS)
    4965
    50 gdbm.lib: $(OBJS) gdbm.h
    51     del gdbm.lib
    52     $(AR) /out:gdbm.lib $(OBJS)
    53 
    54 testgdbm.exe: testgdbm$o gdbm.lib
    55     $(LINK) /Fe"testgdbm.exe" testgdbm$o gdbm.lib
    56 
     66install:
    5767
    5868clean:
    59     rm -f $(PROGS) *$o core junk*
    60 
    61 
    62 # gdbm files
    63 gdbmclose$o:    autoconf.h gdbmdefs.h
    64 gdbmdelete$o:   autoconf.h gdbmdefs.h gdbmerrno.h
    65 gdbmfetch$o:    autoconf.h gdbmdefs.h gdbmerrno.h
    66 gdbmopen$o: autoconf.h gdbmdefs.h gdbmerrno.h
    67 gdbmreorg$o:    autoconf.h gdbmdefs.h gdbmerrno.h extern.h
    68 gdbmseq$o:  autoconf.h gdbmdefs.h
    69 gdbmstore$o:    autoconf.h gdbmdefs.h gdbmerrno.h
    70 
    71 # gdbm support files
    72 bucket$o:   autoconf.h gdbmdefs.h
    73 falloc$o:   autoconf.h gdbmdefs.h
    74 alloca$o:   autoconf.h gdbmdefs.h
    75 findkey$o:  autoconf.h gdbmdefs.h
    76 global$o:   autoconf.h gdbmdefs.h gdbmerrno.h
    77 hash$o:     autoconf.h gdbmdefs.h
    78 update$o:   autoconf.h gdbmdefs.h
    79 version$o:
    80 extern.h:
    81 gdbmdefs.h: gdbmconst.h systems.h
    82     touch gdbmdefs.h
    83 
    84 # other programs
    85 testgdbm$o: autoconf.h gdbmdefs.h extern.h gdbmerrno.h systems.h
    86 testdbm$o:  autoconf.h
    87 testndbm$o: autoconf.h ndbm.h
    88 tdbm$o:     autoconf.h
    89 conv2gdbm$o:    autoconf.h gdbm.h
     69    del gdbm.lib *$o
  • trunk/gsdl/src/colservr/win32.mak

    r743 r1000  
    2525###########################################################################
    2626
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    2729
    2830AR = lib
    2931CC = cl
    3032CPPFLAGS =
    31 DEFS = -DNZDL -DQUIET -D__WIN32__ -D_LITTLE_ENDIAN -DGSDL_NAMESPACE_BROKEN \
     33LDFLAGS =
     34DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
    3235       -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \
    3336       -DGSDLSERVER
    34 INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \
    35        -I../../packages/mg/lib -I../../packages/mg/src/text \
    36        -I..\..\packages\wingdbm -If:\STLport-3.2\stlport
     37INCLUDES = -I$(GSDLHOME)\src\colservr -I$(GSDLHOME)\lib -I$(GSDLHOME)\src\recpt \
     38       -I$(GSDLHOME)\packages\mg -I$(GSDLHOME)\packages\mg\lib \
     39       -I$(GSDLHOME)\packages\mg\src\text -I$(GSDLHOME)\packages\wingdbm \
     40       -I$(STLPATH)
    3741
    38 LDFLAGS =
    39 LIBS = ..\..\packages\wingdbm\gdbm.lib
     42LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib
    4043
    4144COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
  • trunk/gsdl/src/db2txt/win32.mak

    r744 r1000  
    11###########################################################################
    22#
    3 # win32.mak -- Makefile for file db2txt
    4 # Copyright (C) 1999 DigiLib Systems Ltd, All rights reserved
     3# win32 makefile -- db2txt
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    524#
    625###########################################################################
    726
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    829
    9 PACKAGE = db2txt
    10 VERSION =
    11  
    1230AR = lib
    1331CC = cl
    14 #CFLAGS = -g -O
    1532CPPFLAGS =
    16 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D__STL_NO_NEW_IOSTREAMS \
    17 -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX
    18 INCLUDES = -I. -I..\..\lib -I..\..\packages\mg-1.3d\lib \
    19        -If:\STLport-3.2\stlport -I..\..\packages\wingdbm
    20 LIBS = ..\..\packages\mg-1.3d\lib\unitool.obj ..\..\lib\gsdllib.lib \
    21        ..\..\lib\gsdlunicode.obj ..\..\packages\wingdbm\gdbm.lib
    22 GSDLOS = windows
     33LDFLAGS =
     34DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \
     35       -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H
     36INCLUDES = -I$(GSDLHOME)\src\db2txt -I$(GSDLHOME)\lib -I$(GSDLHOME)\packages\mg\lib \
     37       -I$(STLPATH) -I$(GSDLHOME)\packages\wingdbm
     38LIBS = $(GSDLHOME)\packages\mg\lib\unitool.obj $(GSDLHOME)\lib\gsdllib.lib \
     39       $(GSDLHOME)\packages\wingdbm\gdbm.lib
    2340
    2441COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
     
    3350o = .obj
    3451e = .exe
    35  
     52
    3653HEADERS =
    3754
     
    4158
    4259EXEC = db2txt$e
    43  
     60
    4461all : $(EXEC)
    4562
    4663install: $(EXEC)
    47     copy $(EXEC) ../../bin/$(GSDLOS)/$(EXEC)
     64    if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows
     65    copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)
    4866
    4967clean:
     
    5169    del $(EXEC)
    5270
    53 DB2TXT_OBJS = db2txt$o
    54 
    55 db2txt$e: $(DB2TXT_OBJS) $(LIBS)
    56       $(LINK) $(DB2TXT_OBJS) $(LIBS)
     71db2txt$e: $(OBJECTS) $(LIBS)
     72      $(LINK) $(OBJECTS) $(LIBS)
  • trunk/gsdl/src/hashfile/win32.mak

    r744 r1000  
    11###########################################################################
    22#
    3 # win32.mak -- Makefile for file hashfile
    4 # Copyright (C) 1999 DigiLib Systems Ltd, All rights reserved
     3# win32 makefile -- hashfile
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    524#
    625###########################################################################
     26 
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    729
    8 
    9 PACKAGE = hashfile
    10 VERSION =
    11  
    1230AR = lib
    1331CC = cl
    14 #CFLAGS = -g -O
    1532CPPFLAGS =
    16 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D__STL_NO_NEW_IOSTREAMS \
    17        -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX
    18 INCLUDES = -I. -I..\..\lib -If:\STLport-3.2\stlport
    19 LIBS = ..\..\lib\gsdllib.lib
    20 GSDLOS = windows
     33DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \
     34       -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H
     35INCLUDES = -I$(GSDLHOME)\src\hashfile -I$(GSDLHOME)\lib -I$(STLPATH)
     36LIBS = $(GSDLHOME)\lib\gsdllib.lib
    2137
    2238COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
     
    4359
    4460install: $(EXEC)
    45     copy $(EXEC) ../../bin/$(GSDLOS)/$(EXEC)
     61    if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows
     62    copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)
    4663
    4764clean:
  • trunk/gsdl/src/recpt/buildaction.cpp

    r984 r1000  
    2424 *********************************************************************/
    2525
     26#ifndef __WIN32__
    2627#include <unistd.h>
     28#endif
    2729
    2830#include "OIDtools.h"
  • trunk/gsdl/src/recpt/delhistoryaction.cpp

    r962 r1000  
    2626 *********************************************************************/
    2727
    28 
    29 
    3028#include "delhistoryaction.h"
    31 //#include "querytools.h"
    32 //#include "formattools.h"
    3329#include "cgiutils.h"
    34 //#include "OIDtools.h"
    35 //#include "infodbclass.h"
    36 //#include "fileutil.h"
    3730#include "text_t.h"
    3831#include "historydb.h"
    39 
    4032
    4133delhistoryaction::delhistoryaction () {
     
    9385
    9486bool delhistoryaction::check_cgiargs (cgiargsinfoclass & /*argsinfo*/, cgiargsclass & /*args*/,
    95                  ostream &/*logout*/) {
     87                      ostream &/*logout*/) {
    9688  //dont check anything yet
    9789  return true;
     
    9991
    10092void delhistoryaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
    101                     response_t &response, text_t &response_data,
    102                     ostream &/*logout*/) {
     93                    response_t &response, text_t &response_data,
     94                    ostream &/*logout*/) {
    10395  response = content;
    10496  response_data = "text/html";
     
    10698
    10799void delhistoryaction::define_internal_macros (displayclass &/*disp*/, cgiargsclass &/*args*/,
    108                       recptprotolistclass */*protos*/,
    109                       ostream &/*logout*/) {
     100                           recptprotolistclass * /*protos*/,
     101                           ostream &/*logout*/) {
    110102
    111103  // define_internal_macros sets the following macros:
  • trunk/gsdl/src/recpt/historydb.h

    r963 r1000  
    3333#include "text_t.h"
    3434#include "recptproto.h"
    35 #include <map.h>
    3635
    3736struct HistRecord {
  • trunk/gsdl/src/recpt/userdb.cpp

    r997 r1000  
    2828/*
    2929   $Log$
     30   Revision 1.6  2000/03/01 22:23:09  sjboddie
     31   tidied up windows installation
     32
    3033   Revision 1.5  2000/02/29 21:53:09  sjboddie
    3134   tidied up crypt includes
     
    5457
    5558// include crypt
     59#if defined(__WIN32__)
     60#include "crypt.h"
     61#else
    5662#if defined(HAVE_CRYPT_H)
    5763#include <crypt.h>
    5864#else
    5965#include <unistd.h>
     66#endif
    6067#endif
    6168
  • trunk/gsdl/src/recpt/win32.mak

    r743 r1000  
    2525###########################################################################
    2626
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
     29
    2730AR = lib
    2831CC = cl
    2932CPPFLAGS =
    30 DEFS = -DNZDL -DQUIET -D__WIN32__ -D_LITTLE_ENDIAN -DGSDL_NAMESPACE_BROKEN \
     33LDFLAGS =
     34DEFS = -DNZDL -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
    3135       -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS \
    3236       -DGSDLSERVER -DGSDLUSAGELOG 
    33 INCLUDES = -I..\..\lib -I. -I..\colservr -I..\..\packages\mg \
    34        -I..\..\packages\mg\lib -I..\..\packages\mg\src\text \
    35        -I..\..\packages\wingdbm -If:\STLport-3.2\stlport \
    36        -If:\cw32crypt
     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\wingdbm \
     40       -I$(STLPATH) -I$(GSDLHOME)\packages\wincrypt
    3741
    38 LDFLAGS =
    39 LIBS = ..\..\packages\wingdbm\gdbm.lib f:\cw32crypt\crypt.lib
     42LIBS = $(GSDLHOME)\packages\wingdbm\gdbm.lib $(GSDLHOME)\packages\wincrypt\crypt.lib
    4043
    4144COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     
    5154    $(COMPILE) $<
    5255
     56
    5357COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
    5458                converter.h recptconfig.h cgiutils.h OIDtools.h browsetools.h htmlgen.h \
     
    5963                userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \
    6064        datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \
    61         htmlbrowserclass.h
     65        htmlbrowserclass.h delhistoryaction.h historydb.h
    6266
    6367RECEPTHEADERS =
     
    7579        tipaction.cpp authenaction.cpp infodbclass.cpp userdb.cpp usersaction.cpp \
    7680        vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \
    77         invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp
     81        invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \
     82        delhistoryaction.cpp historydb.cpp
    7883
    7984
     
    9398                infodbclass.obj userdb.obj usersaction.obj vlistbrowserclass.obj \
    9499        hlistbrowserclass.obj datelistbrowserclass.obj invbrowserclass.obj \
    95         pagedbrowserclass.obj htmlbrowserclass.obj
     100        pagedbrowserclass.obj htmlbrowserclass.obj delhistoryaction.obj \
     101        historydb.obj
    96102
    97103RECPTOBJECTS = recptmain.obj
     
    102108
    103109
    104 COLSERVROBJECTS = ..\colservr\mgq.obj \
    105                   ..\colservr\mgsearch.obj \
    106                   ..\colservr\querycache.obj \
    107                   ..\colservr\queryinfo.obj \
    108                   ..\colservr\collectserver.obj \
    109                   ..\colservr\colservrconfig.obj \
    110                   ..\colservr\maptools.obj \
    111                   ..\colservr\filter.obj \
    112                   ..\colservr\source.obj \
    113                   ..\colservr\browsefilter.obj \
    114                   ..\colservr\queryfilter.obj \
    115                   ..\colservr\mggdbmsource.obj \
    116                   ..\colservr\phrasesearch.obj \
    117                   ..\colservr\phrasequeryfilter.obj
     110COLSERVROBJECTS = $(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
    118124
    119125EXEC = recpt.exe library.exe
     
    127133
    128134install:
    129     copy library.exe f:\apache\cgi-bin\library.exe
     135    copy library.exe $(GSDLHOME)\cgi-bin\library.exe
    130136
    131137# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    132138
    133139RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
    134     ..\..\lib\gsdllib.lib  \
    135     ..\..\packages\mg\src\text\libtextin.lib \
    136     ..\..\packages\mg\lib\libmg.lib
     140    $(GSDLHOME)\lib\gsdllib.lib  \
     141    $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
     142    $(GSDLHOME)\packages\mg\lib\libmg.lib
    137143
    138144recpt.exe: $(RECPT_OBJS)
     
    142148
    143149LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
    144     ..\..\lib\gsdllib.lib \
    145     ..\..\packages\mg\src\text\libtextin.lib \
    146     ..\..\packages\mg\lib\libmg.lib
     150    $(GSDLHOME)\lib\gsdllib.lib \
     151    $(GSDLHOME)\packages\mg\src\text\libtextin.lib \
     152    $(GSDLHOME)\packages\mg\lib\libmg.lib
    147153
    148154library.exe: $(LIBRARY_OBJS)
  • trunk/gsdl/src/txt2db/win32.mak

    r903 r1000  
    11###########################################################################
    22#
    3 # win32.mak -- Makefile for file txt2db
    4 # Copyright (C) 1999 DigiLib Systems Ltd, All rights reserved
     3# win32 makefile -- txt2db
     4# A component of the Greenstone digital library software
     5# from the New Zealand Digital Library Project at the
     6# University of Waikato, New Zealand.
     7#
     8# Copyright (C) 1999  The New Zealand Digital Library Project
     9#
     10#
     11# This program is free software; you can redistribute it and/or modify
     12# it under the terms of the GNU General Public License as published by
     13# the Free Software Foundation; either version 2 of the License, or
     14# (at your option) any later version.
     15#
     16# This program is distributed in the hope that it will be useful,
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     19# GNU General Public License for more details.
     20#
     21# You should have received a copy of the GNU General Public License
     22# along with this program; if not, write to the Free Software
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    524#
    625###########################################################################
    726
     27GSDLHOME = d:\home\dl\gsdl
     28STLPATH = d:\home\dl\stl\stlport
    829
    9 PACKAGE = txt2db
    10 VERSION =
    11  
    1230AR = lib
    1331CC = cl
    14 #CFLAGS = -g -O
    1532CPPFLAGS =
    16 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D__STL_NO_NEW_IOSTREAMS \
    17 -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX
    18 INCLUDES = -I. -I..\..\lib -I..\..\packages\mg\lib \
    19        -Id:\home\dl\stl\stlport -I..\..\packages\wingdbm
    20 LIBS = ..\..\packages\mg\lib\unitool.obj ..\..\lib\gsdllib.lib \
    21        ..\..\lib\gsdlunicode.obj ..\..\packages\wingdbm\gdbm.lib
    22 GSDLOS = windows
     33LDFLAGS =
     34DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D__STL_NO_NEW_IOSTREAMS \
     35       -DGSDL_NAMESPACE_BROKEN -DSHORT_SUFFIX -DGSDL_USE_IOS_H
     36INCLUDES = -I$(GSDLHOME)\src\txt2db -I$(GSDLHOME)\lib -I$(GSDLHOME)\packages\mg\lib \
     37       -I$(STLPATH) -I$(GSDLHOME)\packages\wingdbm
     38LIBS = $(GSDLHOME)\packages\mg\lib\unitool.obj $(GSDLHOME)\lib\gsdllib.lib \
     39       $(GSDLHOME)\packages\wingdbm\gdbm.lib
    2340
    2441COMPILE = $(CC) -c -GX $(DEFS) $(INCLUDES)
     
    3855SOURCES = txt2db.cpp
    3956
    40 OBJECTS = txt2db.obj
     57OBJECTS = txt2db$o
    4158
    4259EXEC = txt2db$e
     
    4562
    4663install: $(EXEC)
    47     copy -s $(EXEC) ../../bin/$(GSDLOS)/$(EXEC)
     64    if NOT EXIST $(GSDLHOME)\bin\windows mkdir $(GSDLHOME)\bin\windows
     65    copy $(EXEC) $(GSDLHOME)\bin\windows\$(EXEC)
    4866
    4967clean:
     
    5169    del $(EXEC)
    5270
    53 TXT2DB_OBJS = txt2db$o
    54 
    55 txt2db$e: $(TXT2DB_OBJS) $(LIBS)
    56       $(LINK) $(TXT2DB_OBJS) $(LIBS)
     71txt2db$e: $(OBJECTS) $(LIBS)
     72      $(LINK) $(OBJECTS) $(LIBS)
Note: See TracChangeset for help on using the changeset viewer.