Coverity fixes for TC-2075. Makefile changes.

[platform/upstream/csf-framework.git] / framework / Makefile

diff --git a/framework/Makefile b/framework/Makefile
index c0a14dd..fc00d3e 100644 (file)
--- a/framework/Makefile
+++ b/framework/Makefile
@@ -64,17 +64,32 @@ endif
 
 CFLAGS := $(CFLAGS) $(PKCL_CFLAGS) $(TCS_CFLAGS)
 
+# Define a list of pkg-config packages we want to use
+pkg_packages = dlog
+
+PKG_CFLAGS  = $(shell pkg-config --cflags $(pkg_packages))
+PKG_LDFLAGS = $(shell pkg-config --libs $(pkg_packages))
+
+# Combine user supplied, additional, and pkg-config flags
+ifeq ($(TCS_CFG), release)
+       PKGLD_FLAGS =
+       PKGCFLAGS =
+else
+       PKGLD_FLAGS += $(PKG_LDFLAGS) -L./lib
+       PKGCFLAGS += -I$(SRCDIR) $(PKCL_CFLAGS) $(PKG_CFLAGS)
+endif
+
 SOURCES = $(SRCDIR)/TCSImpl.c $(SRCDIR)/TWPImpl.c
 
 OBJECTS = $(OUTDIR)/TCSImpl.o $(OUTDIR)/TWPImpl.o
 
 $(OUTDIR)/%.o: $(SRCDIR)/%.c
-       $(CC) $(CFLAGS) -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c
+       $(CC) $(CFLAGS) $(PKGCFLAGS) -I. -o $(OUTDIR)/$*.o -c $(SRCDIR)/$*.c
 
 all: $(OUTDIR) $(TARGET)
 
 $(TARGET): $(OBJECTS)
-       $(CC) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS)
+       $(CC) -shared -Wl,-zdefs -o $(TARGET) $(OBJECTS) $(LD_FLAGS) $(PKGLD_FLAGS)
 
 $(OUTDIR):
        @mkdir $(OUTDIR)