[maker] Fix the pkg-config issue so that XPCOM build doesn't break...

diff --git a/build/pkgconfig.mk b/build/pkgconfig.mk
index 75b28fe185a352c8cf6fe3ed7a8b402115b0bd99..471f2a4fa9188bd805bbdb6836cb937728d20a61 100644 (file)
--- a/build/pkgconfig.mk
+++ b/build/pkgconfig.mk
@@ -1,13 +1,24 @@
+FOUND_PKGS = 0
+
 ifneq ($(PKGS),)
 
- ifeq ($(shell $(PKG_CONFIG) --exists --print-errors $(PKGS) && echo ok),)
-  $(error PKGS not found)
+ ifeq ($(shell $(PKG_CONFIG) --exists --print-errors $(PKGS) 2>/dev/null && echo ok),)
+ else
+  FOUND_PKGS = 1
  endif
 
+ifeq ($(FOUND_PKGS),1)
+
 CPPFLAGS       += $(shell $(PKG_CONFIG) --cflags-only-I $(PKGS))
 CFLAGS         += $(shell $(PKG_CONFIG) --cflags-only-other $(PKGS))
 LDFLAGS                += $(shell $(PKG_CONFIG) --libs-only-other $(PKGS))
 LIBS           += $(shell $(PKG_CONFIG) --libs-only-L $(PKGS)) \
                   $(shell $(PKG_CONFIG) --libs-only-l $(PKGS))
+endif
+
+endif
 
+pkg-check:
+ifeq ($(FOUND_PKGS),0)
+       $(error $(shell $(PKG_CONFIG) --exists --print-errors $(PKGS)))
 endif

diff --git a/build/target.mk b/build/target.mk
index 39c1f2971cca2fd10e801a45d6e847204f7f6012..55826fbdabcd6dfc2b27470a57618d180275a107 100644 (file)
--- a/build/target.mk
+++ b/build/target.mk
@@ -1,11 +1,7 @@
 $(if $(NAME),,$(error NAME not specified for target))
 $(if $(SOURCES),,$(error SOURCES not specified for target))
 
-# FIXME: hack, should check for the "install" target and not include
-# it then instead of by the name
-ifeq ($(NAME),jscorebus)
 -include build/pkgconfig.mk
-endif
 
 CONFIGFLAGS    := $(if $(CONFIG),-include $(CONFIG),)
 GENERICFLAGS   := $(CPPFLAGS) $(CONFIGFLAGS) $(CFLAGS) -c -MD
@@ -19,4 +15,4 @@ PIC_OBJECTS   := $(patsubst %,$(O)/obj/%.os,$(basename $(SOURCES)))
 
 -include $(SOURCES:%=$(O)/obj/%.d)
 
-$(OBJECTS) $(PIC_OBJECTS): $(CONFIG)
+$(OBJECTS) $(PIC_OBJECTS): pkg-check $(CONFIG)