Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31406/src
Modified Files:
Makefile.am
Log Message:
Perhaps this works better...
Index: Makefile.am
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am 26 Dec 2003 14:25:29 -0000 1.10
+++ Makefile.am 30 Dec 2003 13:22:06 -0000 1.11
@@ -37,7 +37,7 @@
echo -e "$(WARNINGCOLOR)ok, but warnings:"; \
cat .err; \
rm -f .err; \
- echo -e "$(DEFAULTCOLOR)"; \
+ echo -e "$(ACTIONCOLOR)"; \
else \
echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \
fi; \
@@ -45,7 +45,7 @@
echo -e "failed:"; \
cat .err; \
rm -f .err; \
- echo -e "$(DEFAULTCOLOR)"; \
+ echo -e "$(ACTIONCOLOR)"; \
false; \
fi;
@@ -57,7 +57,7 @@
echo -e "$(WARNINGCOLOR)ok, but warnings:"; \
cat .err; \
rm -f .err; \
- echo -e "$(DEFAULTCOLOR)"; \
+ echo -e "$(ACTIONCOLOR)"; \
else \
echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \
fi; \
@@ -65,19 +65,19 @@
echo -e "failed:"; \
cat .err; \
rm -f .err; \
- echo -e "$(DEFAULTCOLOR)"; \
+ echo -e "$(ACTIONCOLOR)"; \
false; \
fi;
@RES@:
- @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to \\c";
+ @echo -e "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)wxInterface_private.rc$(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:"; \
cat .err; \
rm -f .err; \
- echo -e "$(DEFAULTCOLOR)"; \
+ echo -e "$(ACTIONCOLOR)"; \
else \
echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \
fi; \
@@ -85,7 +85,7 @@
echo -e "failed:"; \
cat .err; \
rm -f .err; \
- echo -e "$(DEFAULTCOLOR)"; \
+ echo -e "$(ACTIONCOLOR)"; \
false; \
fi;
@@ -95,24 +95,24 @@
@echo -e "$(ATTENTIONCOLOR)\\c"
@if @CXX@ -o $(PROGRAM) $(WXINTERFACE_OBJECTS) @TRAY_OBJECTS@ @LIBS@ 2>.err; then \
echo -e "$(WELLCOLOR)ok."; \
- echo -e "$(DEFAULTCOLOR)\\c"; \
+ echo -e "$(ACTIONCOLOR)\\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."; \
+ echo -e "$(ACTIONCOLOR)Now cd to src/ dir and type $(OUTPUTCOLOR)./$@$(ACTIONCOLOR) to start the application."; \
else \
echo -e "failed:"; \
cat .err; \
- echo -e "$(DEFAULTCOLOR)"; \
+ echo -e "$(ACTIONCOLOR)"; \
false; \
fi
clean:
@echo -e "Cleaning up...\\c";
@rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe @TRAY_OBJECTS@;
- @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)";
+ @echo -e "$(WELLCOLOR) ok.$(ACTIONCOLOR)";
distclean:
@echo -e "Cleaning up...\\c";
@rm -f $(WXINTERFACE_OBJECTS) $(PROGRAM) $(PROGRAM).exe Makefile @TRAY_OBJECTS@;
- @echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)";
+ @echo -e "$(WELLCOLOR) ok.$(ACTIONCOLOR)";
|
