diff --git a/wmake/rules/General/general b/wmake/rules/General/general index 419d9b1d38..d0253e80b3 100644 --- a/wmake/rules/General/general +++ b/wmake/rules/General/general @@ -1,6 +1,7 @@ AR = ar ARFLAGS = cr RANLIB = ranlib +CPP = cpp LD = ld GFLAGS = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION) diff --git a/wmake/rules/SiCortex64Gcc/flex++ b/wmake/rules/SiCortex64Gcc/flex++ deleted file mode 100644 index 69d6f37319..0000000000 --- a/wmake/rules/SiCortex64Gcc/flex++ +++ /dev/null @@ -1,6 +0,0 @@ -.SUFFIXES: .L - -Ltoo = flex --c++ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@ - -.L.dep: - $(MAKE_DEP) diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general index d70a77cdb0..eb820ab36d 100644 --- a/wmake/rules/SiCortex64Gcc/general +++ b/wmake/rules/SiCortex64Gcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -A64 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general index f9b5632198..d24e8f0056 100644 --- a/wmake/rules/SunOS64Gcc/general +++ b/wmake/rules/SunOS64Gcc/general @@ -1,4 +1,4 @@ -CPP = /lib/cpp $(GFLAGS) +CPP = /lib/cpp LD = ld -64 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc43/general +++ b/wmake/rules/linux64Gcc43/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Gcc44/general +++ b/wmake/rules/linux64Gcc44/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linux64Icc/general +++ b/wmake/rules/linux64Icc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc43/general +++ b/wmake/rules/linuxGcc43/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxGcc44/general +++ b/wmake/rules/linuxGcc44/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general index 10237bd1b6..7285501d98 100644 --- a/wmake/rules/linuxIA64Gcc/general +++ b/wmake/rules/linuxIA64Gcc/general @@ -1,6 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) -LD = ld - PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general index 8d72138115..66953a9652 100644 --- a/wmake/rules/linuxIA64Icc/general +++ b/wmake/rules/linuxIA64Icc/general @@ -1,8 +1,4 @@ -CPP = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH -AR = ar -ARFLAGS = cr -RANLIB = ranlib -LD = ld +CPP = cpp -DICC_IA64_PREFETCH GLIBS = -liberty diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general index 02ad6973ff..c19ca19394 100644 --- a/wmake/rules/linuxIcc/general +++ b/wmake/rules/linuxIcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general index 76d507634a..81927e682b 100644 --- a/wmake/rules/linuxPPC64Gcc/general +++ b/wmake/rules/linuxPPC64Gcc/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = ld -m elf64ppc PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general index bd79de9270..26658e0c98 100644 --- a/wmake/rules/linuxmingw32/general +++ b/wmake/rules/linuxmingw32/general @@ -1,4 +1,3 @@ -CPP = /lib/cpp $(GFLAGS) LD = mingw32-ld PROJECT_LIBS = -l$(WM_PROJECT) diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general index 712af78559..c8641ef7e5 100644 --- a/wmake/rules/solarisGcc/general +++ b/wmake/rules/solarisGcc/general @@ -1,4 +1,4 @@ -CPP = /usr/lib/cpp -undef $(GFLAGS) +CPP = /usr/lib/cpp -undef PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream