Changeset 15470 for gsdl/trunk/src/protocol/Makefile.in

Timestamp:

2008-05-15T12:00:01+12:00 (16 years ago)

Author:

mdewsnip

Message:

Big tidy up to Makefile.

File:

• gsdl/trunk/src/protocol/Makefile.in (modified) (2 diffs)

gsdl/trunk/src/protocol/Makefile.in

@@ -25 +25 @@
 ###########################################################################
 
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
+GSDL_DIR = ../..
+INDEXERS_DIR = $(GSDL_DIR)/indexers
+COLSERVR_DIR = $(GSDL_DIR)/src/colservr
 
-INDEXERS_DIR = ../../indexers
+CPP = @CXX@
+CPPFLAGS = @CXXFLAGS@
+DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
+# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
+INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
 
-# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
-INCLUDES = -I. -I../.. -I../../lib -I../colservr -I$(INDEXERS_DIR)/mgpp/text
 
-CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
-CXXLINK = $(CXX) $(LDFLAGS) -o $@
+CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
+CPPLINK = $(CPP) $(LDFLAGS) -o $@
 
 
@@ -41 +43 @@
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(CXXCOMPILE) $< 
+    $(CPPCOMPILE) $< 
 
 
-HEADERS = recptproto.h nullproto.h
+SOURCES = \
+    nullproto.cpp \
+    recptproto.cpp
 
-SOURCES = recptproto.cpp nullproto.cpp
-
-OBJECTS = recptproto.o nullproto.o
+OBJECTS = \
+    nullproto.o \
+    recptproto.o 
 
 
 all: $(OBJECTS)
 
-distclean:
-    rm -f $(OBJECTS) Makefile
+install:
+
 clean:
     rm -f $(OBJECTS)
 
-install:
+distclean:
+    rm -f $(OBJECTS) Makefile
 
 depend:
-    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
+    makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)