diff --git a/wmake/rules/General/general b/wmake/rules/General/general index 419d9b1d38244cee1ab5fba753e639089474df7f..d0253e80b313ae029a89d47ce5bf7282930770b9 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 69d6f37319aade11977208639b6269457df173a7..0000000000000000000000000000000000000000 --- 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 d70a77cdb037212e12f9b54cd0c80005dcae4ccb..eb820ab36dcb8239b2ced6df5fb78393810645dc 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 f9b563219850dada6751ec3cf50b17291f212d0f..d24e8f005659f660d4f1f3d8563bccfc00db4dea 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 10237bd1b67211d2d008b2e9fe5c52248e359ab6..7285501d981c0bd3c55ca4134d0457d0fca23239 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 10237bd1b67211d2d008b2e9fe5c52248e359ab6..7285501d981c0bd3c55ca4134d0457d0fca23239 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 10237bd1b67211d2d008b2e9fe5c52248e359ab6..7285501d981c0bd3c55ca4134d0457d0fca23239 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 10237bd1b67211d2d008b2e9fe5c52248e359ab6..7285501d981c0bd3c55ca4134d0457d0fca23239 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 02ad6973ff3f0dd9498c091f427642d23c867508..c19ca193948e1c52ce231f177f7ea3efa8366678 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 02ad6973ff3f0dd9498c091f427642d23c867508..c19ca193948e1c52ce231f177f7ea3efa8366678 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 02ad6973ff3f0dd9498c091f427642d23c867508..c19ca193948e1c52ce231f177f7ea3efa8366678 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 10237bd1b67211d2d008b2e9fe5c52248e359ab6..7285501d981c0bd3c55ca4134d0457d0fca23239 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 8d72138115a0db7b409e36c17dd79fef97001cb9..66953a96525da7764520e91af5771154c97cd1ac 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 02ad6973ff3f0dd9498c091f427642d23c867508..c19ca193948e1c52ce231f177f7ea3efa8366678 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 76d507634a936cc0b01185048dfdd9bbb7da4ec6..81927e682b5ace461356fb95c0dbbe661cf311fb 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 bd79de9270a20ef9f71ef0b795b6a0b15baa6bb7..26658e0c98f93f352e49becb3cb9965417b4bcb1 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 712af785595ee1cf404d1c37468943299bef5558..c8641ef7e5829bf922340e53963f79e6fe42e536 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