Kaydet (Commit) 6ac9a4f0 authored tarafından Baptiste Daroussin's avatar Baptiste Daroussin Kaydeden (comit) Matúš Kukan

Make .mk files more portable

Replace some -ldl by $(DLOPEN_LIBS)
Add some FREEBSD tests

Change-Id: Ic30fe29b938d877694db2927775f89de15c02d87
Reviewed-on: https://gerrit.libreoffice.org/20652Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMatúš Kukan <matus@libreoffice.org>
üst aacf7155
...@@ -51,7 +51,7 @@ else ifeq ($(OS),MACOSX) ...@@ -51,7 +51,7 @@ else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\
OpenGL \ OpenGL \
)) ))
else ifeq ($(OS),LINUX) else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,avmediaogl,\ $(eval $(call gb_Library_add_libs,avmediaogl,\
-lGL \ -lGL \
)) ))
......
...@@ -253,9 +253,9 @@ else ifeq ($(OS),MACOSX) ...@@ -253,9 +253,9 @@ else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\ $(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\
OpenGL \ OpenGL \
)) ))
else ifeq ($(OS),LINUX) else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,chartcore,\ $(eval $(call gb_Library_add_libs,chartcore,\
-ldl \ $(DLOPEN_LIBS) \
-lGL \ -lGL \
-lX11 \ -lX11 \
)) ))
......
...@@ -65,9 +65,9 @@ else ifeq ($(OS),MACOSX) ...@@ -65,9 +65,9 @@ else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\ $(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\
OpenGL \ OpenGL \
)) ))
else ifeq ($(OS),LINUX) else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,chartopengl,\ $(eval $(call gb_Library_add_libs,chartopengl,\
-ldl \ $(DLOPEN_LIBS) \
-lGL \ -lGL \
-lX11 \ -lX11 \
)) ))
......
...@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_l10n_targets,sd,\ ...@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_l10n_targets,sd,\
UIConfig_simpress \ UIConfig_simpress \
)) ))
ifneq ($(OS),DRAGONFLY) ifeq ($(filter DRAGONFLY FREEBSD,$(OS)),)
$(eval $(call gb_Module_add_check_targets,sd,\ $(eval $(call gb_Module_add_check_targets,sd,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sd_uimpress) \ CppunitTest_sd_uimpress) \
......
...@@ -30,8 +30,7 @@ $(eval $(call gb_StaticLibrary_use_api,glxtest,\ ...@@ -30,8 +30,7 @@ $(eval $(call gb_StaticLibrary_use_api,glxtest,\
)) ))
$(eval $(call gb_StaticLibrary_add_libs,glxtest,\ $(eval $(call gb_StaticLibrary_add_libs,glxtest,\
-lm \ -lm $(DLOPEN_LIBS) \
-ldl \
-lpthread \ -lpthread \
-lX11 \ -lX11 \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment