diff --git a/wmake/rules/FreeBSD/general b/wmake/rules/FreeBSD/general index 0ddfddb7d..797ad5ed0 100644 --- a/wmake/rules/FreeBSD/general +++ b/wmake/rules/FreeBSD/general @@ -1,6 +1,6 @@ CPP += -D$(WM_ARCH) -GLIBS = -liberty -lexecinfo +GLIBS = -lexecinfo include $(GENERAL_RULES)/standard diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general index db93f118a..6077c3a69 100644 --- a/wmake/rules/SiCortex64Gcc/general +++ b/wmake/rules/SiCortex64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp $(GFLAGS) LD = ld -A64 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general index 8b603ed6d..915741fb0 100644 --- a/wmake/rules/SunOS64Gcc/general +++ b/wmake/rules/SunOS64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp $(GFLAGS) LD = ld -64 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket +PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 78b75ba6e..308cb4569 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc45/general b/wmake/rules/linux64Gcc45/general index 740c6a58a..2b93c366d 100644 --- a/wmake/rules/linux64Gcc45/general +++ b/wmake/rules/linux64Gcc45/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc46/general b/wmake/rules/linux64Gcc46/general index 740c6a58a..2b93c366d 100644 --- a/wmake/rules/linux64Gcc46/general +++ b/wmake/rules/linux64Gcc46/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc47/general b/wmake/rules/linux64Gcc47/general index 78b75ba6e..308cb4569 100644 --- a/wmake/rules/linux64Gcc47/general +++ b/wmake/rules/linux64Gcc47/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc49/general b/wmake/rules/linux64Gcc49/general index 78b75ba6e..308cb4569 100644 --- a/wmake/rules/linux64Gcc49/general +++ b/wmake/rules/linux64Gcc49/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general index 41494b9dc..ea022af59 100644 --- a/wmake/rules/linux64Icc/general +++ b/wmake/rules/linux64Icc/general @@ -1,7 +1,7 @@ CPP = cpp -P $(GFLAGS) LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general index 2710037b2..490e812ac 100644 --- a/wmake/rules/linuxIA64Gcc/general +++ b/wmake/rules/linuxIA64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp $(GFLAGS) LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64I64/general b/wmake/rules/linuxIA64I64/general index 8d7213811..e550f2d00 100644 --- a/wmake/rules/linuxIA64I64/general +++ b/wmake/rules/linuxIA64I64/general @@ -4,7 +4,7 @@ ARFLAGS = cr RANLIB = ranlib LD = ld -GLIBS = -liberty +GLIBS = include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general index 8d7213811..e550f2d00 100644 --- a/wmake/rules/linuxIA64Icc/general +++ b/wmake/rules/linuxIA64Icc/general @@ -4,7 +4,7 @@ ARFLAGS = cr RANLIB = ranlib LD = ld -GLIBS = -liberty +GLIBS = include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general index 02ad6973f..c300368ee 100644 --- a/wmake/rules/linuxIcc/general +++ b/wmake/rules/linuxIcc/general @@ -1,7 +1,7 @@ CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general index c1c2c4ae7..ee12d5090 100644 --- a/wmake/rules/linuxPPC64Gcc/general +++ b/wmake/rules/linuxPPC64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -m elf64ppc -#PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +#PROJECT_LIBS = -l$(WM_PROJECT) -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/mingwGcc/general b/wmake/rules/mingwGcc/general index fac7c56ed..337a51789 100644 --- a/wmake/rules/mingwGcc/general +++ b/wmake/rules/mingwGcc/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp -Dmingw LD = ld -PROJECT_LIBS = -l$(WM_PROJECT) -liberty +PROJECT_LIBS = -l$(WM_PROJECT) include $(GENERAL_RULES)/standard diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general index aac04c7de..866515ed3 100644 --- a/wmake/rules/solarisGcc/general +++ b/wmake/rules/solarisGcc/general @@ -1,6 +1,6 @@ CPP = /usr/lib/cpp -undef $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket +PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket include $(GENERAL_RULES)/standard