ldc2: Cosmetic fixes and support for compiler orverride

[h316.git] / pc-tools / ldc2 / Makefile

diff --git a/pc-tools/ldc2/Makefile b/pc-tools/ldc2/Makefile
index e5b9c8aa3f3fac8a33f8df04decab4c46746d1c5..4682d17aaea2c3794cee95a701ee0946775a7130 100644 (file)
--- a/pc-tools/ldc2/Makefile
+++ b/pc-tools/ldc2/Makefile
@@ -2,12 +2,12 @@ APP_NAME=ldc2
 APP_OBJECTS= main.o  silent_code.o configuration_manager.o tool.o config.o
 CCFLAGS+=-Wall
 
-
-
 BUILD_STAMP="\"`uname -a`\""
-VERSION="\"0.7\""
+VERSION="\"1.0\""
 BUILD_DATE="\"`date` \""
 
+CXX?=g++
+
 CCFLAGS+=-D BUILD_STAMP=$(BUILD_STAMP) -D VERSION=$(VERSION) -D BUILD_DATE=$(BUILD_DATE)
 
 BLOCK_OBJECTS=tape_block.o eot_block.o data_block.o broken_block.o\
@@ -19,7 +19,6 @@ BLOCK_OBJECTS=tape_block.o eot_block.o data_block.o broken_block.o\
               data_block_0_label_extractor.o data_block_1.o data_block_2.o\
               data_block_3.o data_block_4.o data_block_5.o \
               data_block_6.o data_block_7.o
-              
 
 OBJECTS=$(BLOCK_OBJECTS) $(APP_OBJECTS)
 
@@ -27,6 +26,7 @@ SRC_DIR=src
 
 default: $(APP_NAME)
 
+
 clean: 
        @rm -rf $(APP_NAME) *.o doxy/ $(SRC_DIR)/*~ ul_timestamp *.dep
        @$(MAKE) -C doc clean
@@ -35,14 +35,13 @@ APP_SOURCES=$(foreach obj, $(OBJECTS:.o=.cpp),$(SRC_DIR)/$(obj))
 
 %.dep : $(SRC_DIR)/%.cpp
        @ echo Building dependencies for $<.
-       @$(SHELL) -c  "g++ -M $<" | awk 'BEGIN {N=0}{if(N==0)printf("%s %s\n","$@",$$0);else printf("%s\n", $$0);N+=1;}' >  $@
-       
+       @$(SHELL) -c  "$(CXX) -M $<" | awk 'BEGIN {N=0}{if(N==0)printf("%s %s\n","$@",$$0);else printf("%s\n", $$0);N+=1;}' >  $@
 
 %.o : $(SRC_DIR)/%.cpp %.dep
-       g++ -c $(CCFLAGS) -o $@ $<
+       $(CXX) -c $(CCFLAGS) -o $@ $<
 
 $(APP_NAME) : $(OBJECTS)
-       g++    -o$@ $^
+       $(CXX)    -o$@ $^
 
 saustall: $(OBJECTS:.o=.dep)
 
@@ -75,6 +74,5 @@ all: $(APP_NAME) doxy doc
 %.hh %.cpp:
        @ echo "Missing file \"$@\"... No problem :-)"
 
-
 include $(wildcard *.dep)
 #include $(OBJECTS:.o=.dep)
\ No newline at end of file