Changeset 2371


Ignore:
Timestamp:
2001-05-07T16:38:21+12:00 (23 years ago)
Author:
jrm21
Message:

Minor changes, so compilation works when libgdbm is not in system paths - this
happens on non-linux machines.

Location:
trunk/gsdl/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/src/colservr/Makefile.in

    r2173 r2371  
    6868
    6969INCLUDES = -I. -I../.. -I../../lib -I../recpt \
    70         $(CGI_INCLUDES) $(MG_INCLUDES)
     70        $(CGI_INCLUDES) $(MG_INCLUDES) @GDBM_INCLUDE@
    7171MICO_DIR = @MICO_DIR@
    7272ifeq ($(MICO_DIR), default)

  • trunk/gsdl/src/db2txt/Makefile.in

    r1860 r2371  
    3434DEFS = @DEFS@
    3535RANLIB = @RANLIB@
    36 INCLUDES = -I../../lib
     36INCLUDES = -I../../lib @GDBM_INCLUDE@
    3737LDFLAGS = @LDFLAGS@
    3838DPLIBS =
    39 #LIBS = -lstdc++ -lgdbm
    40 LIBS = @LIBS@
     39LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
    4140GSDLOS = @gsdlos@
    4241

  • trunk/gsdl/src/recpt/Makefile.in

    r2368 r2371  
    8383RANLIB = @RANLIB@
    8484LDFLAGS = @LDFLAGS@
    85 LIBS = @LIBS@
     85GDBM_LIBS=@GDBM_LIBPATH@ -lgdbm
     86LIBS = $(GDBM_LIBS) @LIBS@
    8687
    8788GSDLOS = @gsdlos@
    … …  
    9697MLINK = $(MICO_PATH)mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
    9798MLIBS = $(LIBS) -L../../lib/ -lmico$(MICO_VER) -lmicoaux$(MICO_VER)
     99
     100# in case gdbm.h/libgdbm.a are in a non-standard place...
     101GDBM_OBJS=authenaction.o infodbclass.o userdb.o usersaction.o historydb.o librarymain.o nullproto.o queryaction.o
     102
     103ifeq ($(USE_CORBA), 1)
     104#EXEC = recpt library corbaserver corbarecptldd
     105EXEC = library corbaserver corbarecptldd
     106else
     107#EXEC = recpt library
     108EXEC = library
     109endif
     110
     111all: $(EXEC)
     112
    98113
    99114.SUFFIXES:
    … …  
    105120.cpp.o:
    106121    $(CPPCOMPILE) $<
     122
     123$(GDBM_OBJS) :%.o :%.cpp
     124    $(CPPCOMPILE) @GDBM_INCLUDE@ $<
    107125
    108126.SUFFIXES: .mpp .o
    … …  
    207225          ../colservr/collectset.o
    208226
    209 ifeq ($(USE_CORBA), 1)
    210 #EXEC = recpt library corbaserver corbarecptldd
    211 EXEC = library corbaserver corbarecptldd
    212 else
    213 #EXEC = recpt library
    214 EXEC = library
    215 endif
    216 
    217 all: $(EXEC)
    218 
    219227
    220228

  • trunk/gsdl/src/txt2db/Makefile.in

    r2133 r2371  
    3333DEFS = @DEFS@
    3434RANLIB = @RANLIB@
    35 INCLUDES = -I../../lib
     35INCLUDES = -I../../lib @GDBM_INCLUDE@
    3636LDFLAGS = @LDFLAGS@
    3737DPLIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o
    38 LIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o @LIBS@
     38LIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o @GDBM_LIBPATH@ -lgdbm @LIBS@
    3939GSDLOS = @gsdlos@
    4040
Note: See TracChangeset for help on using the changeset viewer.