X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fpjsip%2FMakefile;h=d2c6f6b88d28762d5b01e0a97e5468c7a1d3d468;hp=20fb6fab734cd1c44721bd72db5764c309bb034b;hb=6945d722e682c0a1e5986f8844ad4428c7f97aea;hpb=6c8d273721e8ddb8dfdb2e8441603aa7b33647a3 diff --git a/package/pjsip/Makefile b/package/pjsip/Makefile index 20fb6fab73..d2c6f6b88d 100644 --- a/package/pjsip/Makefile +++ b/package/pjsip/Makefile @@ -20,7 +20,8 @@ PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/pjproject-$(PKG_VERSION) -PKG_BUILD_DEPENDS:=TARGET_lantiq:kmod-ltq-tapi TARGET_lantiq:kmod-ltq-vmmc +include $(INCLUDE_DIR)/ltqtapi.mk +PKG_BUILD_DEPENDS:=$(LTQ_TAPI_BUILD_DEPENDS) include $(INCLUDE_DIR)/package.mk @@ -70,7 +71,7 @@ EXTRA_CFLAGS:=-I$(STAGING_DIR)/usr/include/drv_tapi -I$(STAGING_DIR)/usr/include endif Package/pjsip-oss=$(call Package/pjsip-template,oss,BROKEN) -Package/pjsip-ltq-tapi=$(call Package/pjsip-template,ltq-tapi,@TARGET_lantiq +TARGET_lantiq:kmod-ltq-tapi +TARGET_lantiq:kmod-ltq-vmmc) +Package/pjsip-ltq-tapi=$(call Package/pjsip-template,ltq-tapi,$(LTQ_TAPI_DEPENDS)) USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1) ifneq ($(USE_LOCAL),) @@ -85,9 +86,9 @@ define Build/Configure endef define Build/Compile - CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ + +CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) $(LIBGCC_S) -lm" \ + LDFLAGS="$(TARGET_LDFLAGS) -lc $(LIBGCC_S) -lm" \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) endef