From 0d23c13cb82a3fe3da95503b738f4230d75fcf6b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 26 Aug 2007 15:00:36 +0000 Subject: [PATCH] defs.mk: Fix glib@mingw and CCONSOLE_DIR - Fix glib CFLAGS for mingw - Fix CCONSOLE_DIR --- make/defs.mk | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index eea3ad48..5946850f 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -619,13 +619,13 @@ LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools endif ifeq ($(USE_CCONSOLE),true) -CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/cconsole /opt/dspider/cconsole)) -CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR)) -RPM_REQUIRES_RUN += cconsole-run >= $(CCONSOLE_VERSION) -RPM_REQUIRES_DEVEL += cconsole-devel >= $(CCONSOLE_VERSION) +CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/dspider/cconsole)) +#CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR)) +#RPM_REQUIRES_RUN += cconsole-run >= $(CCONSOLE_VERSION) +#RPM_REQUIRES_DEVEL += cconsole-devel >= $(CCONSOLE_VERSION) USE_YTOOLS = true INCLUDE += -I$(CCONSOLE_DIR)/include -LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole +#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole endif ifeq ($(USE_JACKJART),true) @@ -709,25 +709,25 @@ endif ifeq ($(USE_GLIB),true) ifneq ($(TARGET),mingw) ifeq ($(ARCH),x86) - PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) - PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) - LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0) - else - ifeq ($(ARCH),x86_64) - PROJECT_CFLAGS += $(shell export 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) - LIBFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0) - endif + PROJECT_CFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) + PROJECT_CPPFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --cflags glib-2.0) + LIBFLAGS += $(shell PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig pkg-config --libs glib-2.0) endif - LIBFLAGS += -ldl -lpthread + ifeq ($(ARCH),x86_64) + PROJECT_CFLAGS += $(shell export 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) + LIBFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0) + endif + LIBFLAGS += -ldl -lpthread else - LIBFLAGS += -lglib-2.0 + INCLUDE += -I$(CROSS_TOOL_DIR)/include/glib-2.0 -I$(CROSS_TOOL_DIR)/lib/glib-2.0/include + LIBFLAGS += -lglib-2.0 endif endif -CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) -CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) -LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) -RPM_REQUIRES = $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) -NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') +CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) +CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) +LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) +RPM_REQUIRES = $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL) +NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')