Changeset 15470

Show
Ignore:
Timestamp:
15.05.2008 12:00:01 (12 years ago)
Author:
mdewsnip
Message:

Big tidy up to Makefile.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/protocol/Makefile.in

    r15450 r15470  
    2525########################################################################### 
    2626 
    27 CXX = @CXX@ 
    28 CXXFLAGS = @CXXFLAGS@ 
    29 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@ 
     27GSDL_DIR = ../.. 
     28INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29COLSERVR_DIR = $(GSDL_DIR)/src/colservr 
    3030 
    31 INDEXERS_DIR = ../../indexers 
     31CPP = @CXX@ 
     32CPPFLAGS = @CXXFLAGS@ 
     33DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 
     34# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
     35INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text 
    3236 
    33 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    34 INCLUDES = -I. -I../.. -I../../lib -I../colservr -I$(INDEXERS_DIR)/mgpp/text 
    3537 
    36 CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 
    37 CXXLINK = $(CXX) $(LDFLAGS) -o $@ 
     38CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
     39CPPLINK = $(CPP) $(LDFLAGS) -o $@ 
    3840 
    3941 
     
    4143.SUFFIXES: .cpp .o 
    4244.cpp.o: 
    43     $(CXXCOMPILE) $<  
     45    $(CPPCOMPILE) $<  
    4446 
    4547 
    46 HEADERS = recptproto.h nullproto.h 
     48SOURCES = \ 
     49    nullproto.cpp \ 
     50    recptproto.cpp 
    4751 
    48 SOURCES = recptproto.cpp nullproto.cpp 
    49  
    50 OBJECTS = recptproto.o nullproto.o 
     52OBJECTS = \ 
     53    nullproto.o \ 
     54    recptproto.o  
    5155 
    5256 
    5357all: $(OBJECTS) 
    5458 
    55 distclean: 
    56     rm -f $(OBJECTS) Makefile 
     59install: 
     60 
    5761clean: 
    5862    rm -f $(OBJECTS) 
    5963 
    60 install: 
     64distclean: 
     65    rm -f $(OBJECTS) Makefile 
    6166 
    6267depend: 
    63     makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES) 
     68    makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)