Changeset 15915


Ignore:
Timestamp:
2008-06-09T13:28:13+12:00 (16 years ago)
Author:
mdewsnip
Message:

Tidied up makefile and removed unnecessary references to the Greenstone "lib" directory (which has just moved).

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r15552 r15915  
    11###########################################################################
    22#
    3 # Makefile -- Makefile for hashfile
     3# Makefile -- src/hashfile
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    66# University of Waikato, New Zealand.
    77#
    8 # Copyright (C) 1999 Rodger McNab, Stefan Boddie
     8# Copyright (C) 1999-2008  The New Zealand Digital Library Project
    99#
    1010#
    … …  
    2323# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2424#
    25 #       @(#)Makefile.in 1.3 16 Mar 1994
    26 #
    2725###########################################################################
    2826
    29  
    30 AR = ar
    31 CC = @CC@
    32 CFLAGS = @CFLAGS@
     27GSDL_DIR = ../..
     28
     29
    3330CXX = @CXX@
    34 CXXFLAGS = @CXXFLAGS@
     31CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    3532DEFS = @DEFS@
    36 RANLIB = @RANLIB@
    37 INCLUDES = -I../../lib
    38 LDFLAGS = @LDFLAGS@
    39 LIBS = ../../lib/gsdllib.a
    40 GSDLOS = @gsdlos@
     33INCLUDES = @INCLUDES@
    4134INSTALL = @INSTALL@
    42  
    43 COMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    44 LINK = $(CXX) $(LDFLAGS) -o $@
    45  
     35LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     36LIBS = @LIBS@
     37
     38
     39CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     40CXXLINK = $(CXX) $(LDFLAGS) -o $@
     41
     42
    4643.SUFFIXES:
    47 .SUFFIXES: .c .o
    48 .c.o:
    49     $(COMPILE) $<
    50 
    5144.SUFFIXES: .cpp .o
    5245.cpp.o:
    53     $(COMPILE) $<
    54  
     46    $(CXXCOMPILE) $<
    5547
    56 HEADERS =
    5748
    58 SOURCES = hashfile.cpp
     49SOURCES = \
     50    hashfile.cpp
    5951
    60 OBJECTS = hashfile.o
     52OBJECTS = \
     53    hashfile.o \
    6154
    62 EXEC    = hashfile
    63  
    64 all : $(EXEC)
     55EXECUTABLE_OBJECTS = \
     56    $(OBJECTS)
    6557
    66 install: $(EXEC)
     58EXECUTABLE = hashfile
     59
     60
     61# Default target: make the hashfile executable
     62all: $(EXECUTABLE)
     63
     64hashfile: $(EXECUTABLE_OBJECTS)
     65    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     66
     67install: $(EXECUTABLE)
    6768    $(INSTALL) -d ../../bin/$(GSDLOS)
    6869    $(INSTALL) -m 755 -s $(EXEC) ../../bin/$(GSDLOS)
    6970
     71clean:
     72    rm -f $(OBJECTS) $(EXECUTABLE)
     73
    7074distclean:
    71     rm -f $(OBJECTS) $(EXEC) Makefile
    72 
    73 clean:
    74     rm -f $(OBJECTS) $(EXEC)
     75    rm -f $(OBJECTS) $(EXECUTABLE) Makefile
    7576
    7677depend:
    7778    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
    78 
    79 
    80 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    81 
    82 HASHFILE_OBJS = hashfile.o
    83 
    84 hashfile: $(HASHFILE_OBJS) $(LIBS)
    85     $(LINK) $(HASHFILE_OBJS) $(LIBS)
Note: See TracChangeset for help on using the changeset viewer.