Ignore:
Timestamp:
2008-12-17T14:32:32+13:00 (15 years ago)
Author:
mdewsnip
Message:

GRRRR -- fixed up a whole lot more inconsistencies in the Makefiles. These were all perfect before the build-src/common-src/runtime-src split!!

Location:
gsdl/trunk/common-src/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/common-src/src/gdbmedit/db2txt/Makefile.in

    r18029 r18224  
    11###########################################################################
    22#
    3 # Makefile -- src/gdbmedit/db2txt
     3# Makefile -- common-src/src/gdbmedit/db2txt
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm
     29
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
     31
    3032
    3133CXX = @CXX@
    … …  
    3335DEFS = @DEFS@
    3436GSDLOS = @gsdlos@
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3638INSTALL = @INSTALL@
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    3941
    4042

  • gsdl/trunk/common-src/src/gdbmedit/gdbmget/Makefile.in

    r18029 r18224  
    11###########################################################################
    22#
    3 # Makefile -- src/gdbmedit/gdbmget
     3# Makefile -- common-src/src/gdbmedit/gdbmget
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm
     29
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
     31
    3032
    3133CXX = @CXX@
    … …  
    3335DEFS = @DEFS@
    3436GSDLOS = @gsdlos@
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3638INSTALL = @INSTALL@
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    3941
    4042

  • gsdl/trunk/common-src/src/gdbmedit/gdbmset/Makefile.in

    r18029 r18224  
    11###########################################################################
    22#
    3 # Makefile -- src/gdbmedit/gdbmset
     3# Makefile -- common-src/src/gdbmedit/gdbmset
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm
     29
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
     31
    3032
    3133CXX = @CXX@
    … …  
    3335DEFS = @DEFS@
    3436GSDLOS = @gsdlos@
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3638INSTALL = @INSTALL@
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    3941
    4042

  • gsdl/trunk/common-src/src/gdbmedit/txt2db/Makefile.in

    r18029 r18224  
    11###########################################################################
    22#
    3 # Makefile -- src/gdbmedit/txt2db
     3# Makefile -- common-src/src/gdbmedit/txt2db
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    2727GSDL_DIR = ../../../..
    2828COMMON_DIR = $(GSDL_DIR)/common-src
    29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm
     29
     30COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
     31
    3032
    3133CXX = @CXX@
    … …  
    3335DEFS = @DEFS@
    3436GSDLOS = @gsdlos@
    35 INCLUDES = -I$(GDBM_DIR)/include -I$(COMMON_DIR)/src/lib
     37INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib
    3638INSTALL = @INSTALL@
    3739LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    38 LIBS = @LIBS@ $(GDBM_DIR)/lib/libgdbm.a
     40LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a
    3941
    4042

  • gsdl/trunk/common-src/src/lib/Makefile.in

    r15910 r18224  
    11###########################################################################
    22#
    3 # Makefile -- lib
     3# Makefile -- common-src/src/lib
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/common-src
     29
     30INDEXERS_DIR = $(COMMON_DIR)/indexers
     31COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3032
    3133
    3234USE_SQLITE = @USE_SQLITE@
    3335ifeq ($(USE_SQLITE), 1)
    34 SQLITE_INCLUDES = -I$(PACKAGES_DIR)/sqlite/include
     36SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include
    3537SQLITE_OBJECTS = sqlitedbclass.o
    3638SQLITE_SOURCES = sqlitedbclass.cpp
    … …  
    4648CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    4749DEFS = @DEFS@
    48 INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR) -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
     50INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
    4951RANLIB = @RANLIB@
    5052
Note: See TracChangeset for help on using the changeset viewer.