Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23522/src
Modified Files:
Makefile.am
Log Message:
BSD compatibility.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am 22 Dec 2003 08:37:55 -0000 1.9
+++ Makefile.am 26 Dec 2003 14:25:29 -0000 1.10
@@ -30,8 +30,8 @@
all: $(PROGRAM)
.c.o:
- @echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to "
- @echo -e -n "$(OUTPUTCOLOR)$@$(ACTIONCOLOR) @PRINT_CPP_FLAGS@: $(ATTENTIONCOLOR)"
+ @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to \\c"
+ @echo -e "$(OUTPUTCOLOR)$@$(ACTIONCOLOR) @PRINT_CPP_FLAGS@: $(ATTENTIONCOLOR)\\c"
@if cc @CFLAGS@ @CPP_FLAGS@ @INCLUDE@ -c -o $@ $< 2>.err; then \
if test -s .err; then \
echo -e "$(WARNINGCOLOR)ok, but warnings:"; \
@@ -50,8 +50,8 @@
fi;
.cpp.o:
- @echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to "
- @echo -e -n "$(OUTPUTCOLOR)$@$(ACTIONCOLOR)@PRINT_CPP_FLAGS@: $(ATTENTIONCOLOR)"
+ @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to \\c"
+ @echo -e "$(OUTPUTCOLOR)$@$(ACTIONCOLOR)@PRINT_CPP_FLAGS@: $(ATTENTIONCOLOR)\\c"
@if @CXX@ @CXX_FLAGS@ @CPP_FLAGS@ @INCLUDE@ -c -o $@ $< 2>.err; then \
if test -s .err; then \
echo -e "$(WARNINGCOLOR)ok, but warnings:"; \
@@ -70,8 +70,8 @@
fi;
@RES@:
- @echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to ";
- @echo -e -n "$(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)";
+ @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to \\c";
+ @echo -e "$(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)\\c";
@if windres -i wxInterface_private.rc -I rc -o $@ -O coff --include-dir=/local/include 2>.err; then \
if test -s .err; then \
echo -e "$(WARNINGCOLOR)ok, but warnings:"; \
@@ -90,15 +90,15 @@
fi;
wxInterface: $(WXINTERFACE_OBJECTS) @TRAY_OBJECTS@
- @echo -e -n "$(ACTIONCOLOR)Linking $(INPUTCOLOR)$(WXINTERFACE_OBJECTS)@TRAY_OBJECTS@ "
- @echo -e -n "$(ACTIONCOLOR)to $(OUTPUTCOLOR)$@$(ACTIONCOLOR)@PRINT_LINK_FLAGS@: "
- @echo -e -n "$(ATTENTIONCOLOR)"
+ @echo -e "$(ACTIONCOLOR)Linking $(INPUTCOLOR)$(WXINTERFACE_OBJECTS)@TRAY_OBJECTS@ \\c"
+ @echo -e "$(ACTIONCOLOR)to $(OUTPUTCOLOR)$@$(ACTIONCOLOR)@PRINT_LINK_FLAGS@: \\c"
+ @echo -e "$(ATTENTIONCOLOR)\\c"
@if @CXX@ -o $(PROGRAM) $(WXINTERFACE_OBJECTS) @TRAY_OBJECTS@ @LIBS@ 2>.err; then \
echo -e "$(WELLCOLOR)ok."; \
- echo -e -n "$(DEFAULTCOLOR)"; \
- echo -e -n "$(WELLCOLOR)Successfully compiled "; \
- echo -e -n "$(WARNINGCOLOR)$(BUILD)"; \
- echo -e -n "$(OUTPUTCOLOR)$@$(WELLCOLOR) binary!\n"; \
+ echo -e "$(DEFAULTCOLOR)\\c"; \
+ echo -e "$(WELLCOLOR)Successfully compiled \\c"; \
+ echo -e "$(WARNINGCOLOR)$(BUILD)\\c"; \
+ echo -e "$(OUTPUTCOLOR)$@$(WELLCOLOR) binary!"; \
echo -e "$(DEFAULTCOLOR)Now cd to src/ dir and type $(OUTPUTCOLOR)./$@$(DEFAULTCOLOR) to start the application."; \
else \
echo -e "failed:"; \
@@ -108,11 +108,11 @@
fi
clean:
- @echo -e -n "Cleaning up..."
- @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe @TRAY_OBJECTS@
- @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)"
+ @echo -e "Cleaning up...\\c";
+ @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe @TRAY_OBJECTS@;
+ @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)";
distclean:
- @echo -e -n "Cleaning up..."
- @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe Makefile @TRAY_OBJECTS@
- @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)"
+ @echo -e "Cleaning up...\\c";
+ @rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe Makefile @TRAY_OBJECTS@;
+ @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)";
|
