janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-29 16:02:49 +01:00
Code Activity

defs.mk: Beautify pkg-config evaluation

Browse source
This commit is contained in:
Jan Lindemann 2012-02-04 17:27:22 +00:00 • committed by Jan Lindemann
commit 09b0b6ac34
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs.mk
View file

@ -4,7 +4,6 @@
ifndef YTOOLS_DEF_MK_INCLUDED ifndef YTOOLS_DEF_MK_INCLUDED
YTOOLS_DEF_MK_INCLUDED = true YTOOLS_DEF_MK_INCLUDED = true
include $(MODDIR)/make/platform.mk include $(MODDIR)/make/platform.mk
# ----- pre-local.mk # ----- pre-local.mk
@ -1290,9 +1289,9 @@ ifeq ($(USE_GLIB),true)
LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0) LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0)
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
PROJECT_CFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0) PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --cflags glib-2.0)
PROJECT_CPPFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --cflags glib-2.0) PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --cflags glib-2.0)
LIBFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0) LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig pkg-config --libs glib-2.0)
endif endif
LIBFLAGS += -ldl -lpthread LIBFLAGS += -ldl -lpthread
else else