diff options
| author | Timotej S <6674623+underhood@users.noreply.github.com> | 2022-09-22 17:31:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-22 17:31:55 +0200 |
| commit | 06368384c10e81d15b2c5408cfeff0a29f65b47f (patch) | |
| tree | 43e81465c438dc2ac84cde7d4c55b8704b4ea92c /Makefile.am | |
| parent | 4453613cba6d939f74e982c1d0e8d85cef8bd6be (diff) | |
Build judy even without dbengine (#13703)
always build judy
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 99 |
1 files changed, 47 insertions, 52 deletions
diff --git a/Makefile.am b/Makefile.am index df535e1c77..3b7d1c78ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -480,65 +480,65 @@ RRD_PLUGIN_FILES = \ database/sqlite/sqlite3.$(OBJEXT) : CFLAGS += -Wno-cast-function-type database/KolmogorovSmirnovDist.$(OBJEXT) : CFLAGS += -Wno-maybe-uninitialized -if ENABLE_DBENGINE - noinst_LIBRARIES = libjudy.a - - libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \ - libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \ - libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \ - libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \ - libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \ - libnetdata/libjudy/src/JudyL/JudyL.h \ - libnetdata/libjudy/src/JudyL/JudyLByCount.c \ - libnetdata/libjudy/src/JudyL/JudyLCascade.c \ - libnetdata/libjudy/src/JudyL/JudyLCount.c \ - libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \ - libnetdata/libjudy/src/JudyL/JudyLDecascade.c \ - libnetdata/libjudy/src/JudyL/JudyLDel.c \ - libnetdata/libjudy/src/JudyL/JudyLFirst.c \ - libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \ - libnetdata/libjudy/src/JudyL/j__udyLGet.c \ - libnetdata/libjudy/src/JudyL/JudyLGet.c \ - libnetdata/libjudy/src/JudyL/JudyLInsArray.c \ - libnetdata/libjudy/src/JudyL/JudyLIns.c \ - libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \ - libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \ - libnetdata/libjudy/src/JudyL/JudyLMemActive.c \ - libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \ - libnetdata/libjudy/src/JudyL/JudyLNext.c \ - libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \ - libnetdata/libjudy/src/JudyL/JudyLPrev.c \ - libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \ - libnetdata/libjudy/src/JudyHS/JudyHS.c \ - $(NULL) +noinst_LIBRARIES = libjudy.a + +libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \ + libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \ + libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \ + libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \ + libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \ + libnetdata/libjudy/src/JudyL/JudyL.h \ + libnetdata/libjudy/src/JudyL/JudyLByCount.c \ + libnetdata/libjudy/src/JudyL/JudyLCascade.c \ + libnetdata/libjudy/src/JudyL/JudyLCount.c \ + libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \ + libnetdata/libjudy/src/JudyL/JudyLDecascade.c \ + libnetdata/libjudy/src/JudyL/JudyLDel.c \ + libnetdata/libjudy/src/JudyL/JudyLFirst.c \ + libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \ + libnetdata/libjudy/src/JudyL/j__udyLGet.c \ + libnetdata/libjudy/src/JudyL/JudyLGet.c \ + libnetdata/libjudy/src/JudyL/JudyLInsArray.c \ + libnetdata/libjudy/src/JudyL/JudyLIns.c \ + libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \ + libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \ + libnetdata/libjudy/src/JudyL/JudyLMemActive.c \ + libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \ + libnetdata/libjudy/src/JudyL/JudyLNext.c \ + libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \ + libnetdata/libjudy/src/JudyL/JudyLPrev.c \ + libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \ + libnetdata/libjudy/src/JudyHS/JudyHS.c \ + $(NULL) - nodist_libjudy_a_SOURCES = JudyLTables.c +nodist_libjudy_a_SOURCES = JudyLTables.c - BUILT_SOURCES += JudyLTables.c +BUILT_SOURCES += JudyLTables.c - CLEANFILES += JudyLTables.c +CLEANFILES += JudyLTables.c - libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough +libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough - libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV - libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV - libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT - libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT - libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS += -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB - libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS += -DJUDYGETINLINE +libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV +libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV +libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT +libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT +libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS += -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB +libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS += -DJUDYGETINLINE - noinst_PROGRAMS = judyltablesgen +noinst_PROGRAMS = judyltablesgen - judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c - judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough +judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c +judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough - judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security +$(builddir)/judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security JudyLTables.c: $(abs_top_srcdir)/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c $(builddir)/judyltablesgen$(EXEEXT) $(builddir)/judyltablesgen$(EXEEXT) - libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL +libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL +if ENABLE_DBENGINE RRD_PLUGIN_FILES += \ database/engine/rrdengine.c \ database/engine/rrdengine.h \ @@ -1002,17 +1002,12 @@ NETDATA_COMMON_LIBS = \ $(OPTIONAL_MQTT_LIBS) \ $(OPTIONAL_UV_LIBS) \ $(OPTIONAL_LZ4_LIBS) \ - $(OPTIONAL_JUDY_LIBS) \ + libjudy.a \ $(OPTIONAL_SSL_LIBS) \ $(OPTIONAL_JSONC_LIBS) \ $(OPTIONAL_ATOMIC_LIBS) \ $(NULL) -if ENABLE_DBENGINE - NETDATA_COMMON_LIBS += libjudy.a \ - $(NULL) -endif - if LINK_STATIC_JSONC NETDATA_COMMON_LIBS += $(abs_top_srcdir)/externaldeps/jsonc/libjson-c.a endif |