Ignore:
Timestamp:
2015-10-09T17:05:03+13:00 (9 years ago)
Author:
jmt12
Message:

Altering the Makefile.in to determine whether it is in GSDL2 or GSDL3 and then setting appropriate paths to GDBM files. This replaces the configure stuff, which wasn't working and looked to tricky to make conditional

File:
1 edited

Legend:

Unmodified
Added
Removed

  • gs2-extensions/parallel-building/trunk/src/src/gdbmcli-src/Makefile.in

    r24639 r30297  
    4545###########################################################################
    4646
    47 GSDL_DIR = ../../../..
     47ifndef GSDL3SRCHOME
     48  GSDL_DIR = ../../../..
     49else
     50  GSDL_DIR = ${GSDL3SRCHOME}/gs2build
     51endif
    4852COMMON_DIR = $(GSDL_DIR)/common-src
    49 
    5053COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    5154
    5255CXX = @CXX@
    5356CXXFLAGS = @CXXFLAGS@
    54 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    55 INCLUDES = -I. @GDBM_CFLAGS@ -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
     57DEFS = @DEFS@ $(JDBM_DEFINES) $(SQLITE_DEFINES)
     58INCLUDES = -I. -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib -I${GEXTPARALLELBUILDING_INSTALLED}/include
    5659INSTALL = @INSTALL@
    5760LDFLAGS = @LDFLAGS@ -L${GEXTPARALLELBUILDING_INSTALLED}/lib
    58 LIBS = -lm -lg @LIBS@ @GDBM_LIBS@ $(COMMON_DIR)/src/lib/gsdllib.a
     61LIBS = -lm -lg @LIBS@ -L$(COMMON_PACKAGES_DIR)/gdbm/lib -lgdbm $(COMMON_DIR)/src/lib/gsdllib.a
    5962
    6063
Note: See TracChangeset for help on using the changeset viewer.