sharedaemon-cvs

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13931

Modified Files:
	Makefile 
Log Message:
System-independant Makefile

Index: Makefile
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile	24 Nov 2003 14:21:58 -0000	1.30
+++ Makefile	4 Dec 2003 19:04:22 -0000	1.31
@@ -35,8 +35,17 @@
 # with debugging information (useful for developers). Debug compilation takes
 # significently less time, but produces slower output binary. Recommended for
 # developers.
-#CPP_FLAGS =	-O3 -pipe -I. -c
-DEBUG_FLAGS =	-pipe -I. -c -Wall -g -ggdb
+CPP_FLAGS =	-O3 -pipe -I. -c
+#DEBUG_FLAGS =	-pipe -I. -c -Wall -g -ggdb
+
+# Uncomment this on win32 systems, adds resources file to compilation objects.
+#RES = wxInterface_private.res
+
+##
+# Our own defines. Only one of meaning is -D__HAVE_REMOVE_GROWABLE_COL__,
+# which should only be enabled if you have patched wxWindows with
+# flexgridsizer.patch
+#DEFINES = -D__HAVE_REMOVE_GROWABLE_COL__
 
 ##
 # Uncomment this line to enable compilation flags showing during compilation.
@@ -52,37 +61,23 @@
 # Only relevant on win32 - Location of windres.exe file
 WINDRES = windres.exe
 
-# Uncomment this on win32 systems, adds resources file to compilation objects.
-#RES = wxInterface_private.res
-
-##
-# Our own defines. Only one of meaning is -D__HAVE_REMOVE_GROWABLE_COL__,
-# which should only be enabled if you have patched wxWindows with
-# flexgridsizer.patch
-#DEFINES = -D__HAVE_REMOVE_GROWABLE_COL__
-
 # Output colours. Comment out to disable output colouring.
-DEFAULTCOLOR  =\33[0;40;37;22m
-ACTIONCOLOR   =\33[0;40;37;2m
-ATTENTIONCOLOR=\33[0;40;31;22m
+DEFAULTCOLOR  =\33[0;22m
+ACTIONCOLOR = \33[0;2m
+ATTENTIONCOLOR=\33[31;22m
 FAILEDCOLOR   =
-WARNINGCOLOR  =\33[0;40;33;22m
-NOTICEGCOLOR  =\33[0;40;33;2m
-WELLCOLOR     =\33[0;40;32;22m
-OUTPUTCOLOR   =\33[0;40;33;1m
-INPUTCOLOR    =\33[0;40;34;1m
-FLAGCOLOR     =\33[0;40;37;1m
+WARNINGCOLOR  =\33[33;22m
+NOTICEGCOLOR  =\33[33;2m
+WELLCOLOR     =\33[32;22m
+OUTPUTCOLOR   =\33[35;1m
+INPUTCOLOR    =\33[34;1m
+FLAGCOLOR     =\33[37;1m
 
 # Don't modify these - automatically generated from WXCONFIG
 CXX =		$(CCACHE) $(shell $(WXCONFIG) --cxx)
 CXX_FLAGS =	$(shell $(WXCONFIG) --cxxflags)
 LIBS =		$(shell $(WXCONFIG) --libs)
 
-# Filenames for pattern rules. These are used for
-# temporary data storage, usually not needed to modify.
-PIPENAME  = Makefile.pipe
-STDERROR = Makefile.stderr
-
 # Any extra include directives needed
 INCLUDE_DIR =	/local/include
 
@@ -126,32 +121,18 @@
 # Compilation #
 ###############
 
+# CPP Files
 .cpp.o :
 ifndef PRINTFLAGS
 	@echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)"
 else
 	@echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR) with flags $(FLAGCOLOR)$(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS)$(ACTIONCOLOR): $(ATTENTIONCOLOR)"
 endif
-	@rm -f $(PIPENAME) $(STDERROR)
-	@mknod $(PIPENAME) p
-	@cat $(PIPENAME) > $(STDERROR) &
-	@if ! $(CXX) $(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $< 2>$(PIPENAME); then \
-		echo -e "$(FAILEDCOLOR)failed:"; \
-		cat $(STDERROR); \
-		echo -e -n "$(DEFAULTCOLOR)"; \
-		rm $(PIPENAME) $(STDERROR); \
-		false; \
-	else \
-		if test -s $(STDERROR); then \
-			echo -e "$(WARNINGCOLOR)ok, but warnings:"; \
-			cat $(STDERROR); \
-			echo -e -n "$(DEFAULTCOLOR)"; \
-		else \
-			echo -e "$(WELLCOLOR)ok.$(DEFAULTCOLOR)"; \
-		fi; \
-	fi
-	@rm $(PIPENAME) $(STDERROR)
+	@if $(CXX) $(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS) -o $@ $<; then \
+		echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \
+	fi;
 
+# Resource files
 .rc.res:
 ifndef PRINTFLAGS
 	@echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)"
@@ -159,40 +140,15 @@
 	@echo -e -n "$(ACTIONCOLOR)Compiling $(INPUTCOLOR)$<$(ACTIONCOLOR) to $(OUTPUTCOLOR)$@$(ACTIONCOLOR) with flags $(FLAGCOLOR)$(CPP_FLAGS) $(DEBUG_FLAGS) $(DEFINES) -I$(INCLUDE_DIR) $(CXX_FLAGS)$(ACTIONCOLOR): $(ATTENTIONCOLOR)"
 endif
 	@rm -f $(PIPENAME) $(STDERROR)
-	@mknod $(PIPENAME) p
-	@cat $(PIPENAME) > $(STDERROR) &
-	@if ! $(WINDRES -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR) 2>$(PIPENAME); then \
-		echo -e "$(FAILEDCOLOR)failed:"; \
-		cat $(STDERROR); \
-		echo -e -n "$(DEFAULTCOLOR)"; \
-		rm $(PIPENAME) $(STDERROR); \
-		false; \
-	else \
-		if test -s $(STDERROR); then \
-			echo -e "$(WARNINGCOLOR)ok, but warnings:"; \
-			cat $(STDERROR); \
-			echo -e -n "$(DEFAULTCOLOR)"; \
-		else \
-			echo -e "$(WELLCOLOR)ok.$(DEFAULTCOLOR)"; \
-		fi; \
-	fi
-	@rm $(PIPENAME) $(STDERROR)
+	@if $(WINDRES) -i $< -I rc -o $@ -O coff --include-dir=$(INCLUDE_DIR); then \
+		echo -e "$(WELLCOLOR)ok.$(ACTIONCOLOR)"; \
+	fi;
 
+# Linking
 $(PROGRAM): 	$(OBJECTS)
 		@echo -e -n "$(ACTIONCOLOR)Linking $(INPUTCOLOR)$(OBJECTS)$(ACTIONCOLOR)to $(OUTPUTCOLOR)$@$(ACTIONCOLOR): $(ATTENTIONCOLOR)"
-		@rm -f $(PIPENAME) $(STDERROR)
-		@mknod $(PIPENAME) p
-		@cat $(PIPENAME) > $(STDERROR) &
-		@if ! $(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS) 2>$(PIPENAME) || \
-		   test -s $(STDERROR); then \
-			echo -e "$(FAILEDCOLOR)failed:"; \
-			cat $(STDERROR); \
-			rm $(PIPENAME) $(STDERROR); \
-			echo -e -n "$(DEFAULTCOLOR)"; \
-			false; \
-		else \
+		@if $(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS); then \
 			echo -e "$(WELLCOLOR)ok."; \
-			rm $(PIPENAME) $(STDERROR); \
 			echo -e -n "$(DEFAULTCOLOR)"; \
 			echo -e -n "$(WELLCOLOR)Successfully compiled "; \
 			echo -e -n "$(WARNINGCOLOR)$(BUILD)"; \
@@ -203,10 +159,29 @@
 # All builds program with default settings.
 all:    $(PROGRAM)
 
-debug:  $(PROGRAM_DEBUG)
+help:
+	@echo "ShareDaemon wxInterface";
+	@echo "Copyright (c) 2003 Alo Sarv";
+	@echo "";
+	@echo "1. You need to have wxWindows (http://www.wxwindows.org) library installed for";
+	@echo "	your system (wxGTK for linux, wxMSW for windows, wxMac for Mac and the ";
+	@echo "	WX_CONFIG variable in this Makefile pointing to your wx-config script ";
+	@echo "	(usually at /usr/local/bin).";
+	@echo "2. Windows (mingw/cygwin) compilation: Uncomment the ";
+	@echo "	`RES=wxInterface_private.res` line in this Makefile.";
+	@echo "3. To make debug build, comment out CPP_FLAGS line in this makefile and ";
+	@echo "	uncomment DEBUG_FLAGS line.";
+	@echo "4. To enable sidebar hiding, you need to patch wxWindows library using ";
+	@echo "	flexgridsizer.patch file and uncomment the ";
+	@echo "	\`-D__HAVE_REMOVE_GROWABLE_COL\` line in this Makefile. For further ";
+	@echo "	instructions, see the INSTALL file.";
+	@echo "5. To enable complete column hiding in list controls under wxGTK, you need";
+	@echo "	to patch wxWindows library with listctrl.patch file. For further";
+	@echo "	instructions, see the INSTALL file.";
+
 
 # Cleanup command
 clean: 
 	@echo -e -n "Cleaning up..."
-	@rm -f $(OBJECTS) $(PROGRAM)
+	@rm -f $(OBJECTS) $(PROGRAM) $(PROGRAM).exe
 	@echo -e "$(WELLCOLOR) ok.$(DEFAULTCOLOR)"