diff -ur yconsole-3.4.3.orig/yconsole/Makefile yconsole-3.4.3/yconsole/Makefile --- yconsole-3.4.3.orig/yconsole/Makefile 2006-08-23 12:03:22.000000000 +0300 +++ yconsole-3.4.3/yconsole/Makefile 2007-08-09 12:23:48.000000000 +0300 @@ -2,23 +2,26 @@ # PREFIX = /usr -CFLAGS = -Wall -O2 -g \ - `imlib-config --cflags` -DHAVE_IMLIB \ - `gtk-config --cflags` +BUILDC = $(CFLAGS) -fno-strict-aliasing -Wall \ + `imlib-config --cflags` -DHAVE_IMLIB \ + `gtk-config --cflags` INC_DIRS = LIBS = -lY2 `imlib-config --libs` `gtk-config --libs` LIB_DIRS = -CC = cc -CPP = c++ +CC = gcc +CXX = g++ # Appended stuff starts here # # C++ flags: -CPPFLAGS = -D__cplusplus -Dc_plusplus +BUILDCXX = $(CXXFLAGS) -fno-strict-aliasing \ + -Wall -D__cplusplus -Dc_plusplus \ + `imlib-config --cflags` -DHAVE_IMLIB \ + `gtk-config --cflags` # Source files list: include Makefile.srclist @@ -35,10 +38,10 @@ OBJ_CPP = $(SRC_CPP:.cpp=.o) .c.o: @echo "Compiling module $*.o" - @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + @+$(CC) -c $*.c $(INC_DIRS) $(BUILDC) .cpp.o: @echo "Compiling module $*.o" - @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + @+$(CXX) -c $*.cpp $(INC_DIRS) $(BUILDCXX) # Programs LS = ls @@ -50,7 +53,7 @@ EXPORT_COMPILETIMEINFO_H = echo -n -e "\ \#ifndef COMPILETIMEINFO_H\n\ \#define COMPILETIMEINFO_H\n\ -\#define COMPILE_COMPILER\t\"`$(CPP) --version | tr '\n' ' '`\"\n\ +\#define COMPILE_COMPILER\t\"`$(CXX) --version | tr '\n' ' '`\"\n\ \#define COMPILE_USER\t\t\"$(USER)\"\n\ \#define COMPILE_LOCATION\t\"`uname -n`\"\n\ \#define COMPILE_DATE\t\t`date +\"%s\"`\n\ @@ -65,7 +68,7 @@ modules: $(OBJ_C) $(OBJ_CPP) @echo -n "Linking modules..." - @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) + @$(CXX) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) @echo -n " " @-$(LS) $(LSFLAGS) $(BIN) diff -ur yconsole-3.4.3.orig/yconsole/Makefile.install.UNIX yconsole-3.4.3/yconsole/Makefile.install.UNIX --- yconsole-3.4.3.orig/yconsole/Makefile.install.UNIX 2006-08-23 12:03:22.000000000 +0300 +++ yconsole-3.4.3/yconsole/Makefile.install.UNIX 2007-08-09 12:23:03.000000000 +0300 @@ -9,9 +9,9 @@ # INSTALL = install -INSTBINFLAGS = -m 0755 -s +INSTBINFLAGS = -m 0755 INSTUIDFLAGS = -m 4755 -INSTLIBFLAGS = -m 0755 -s +INSTLIBFLAGS = -m 0755 INSTINCFLAGS = -m 0644 INSTMANFLAGS = -m 0644 INSTCFGFLAGS = -m 0644