You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by al...@apache.org on 2020/01/22 00:50:28 UTC
[incubator-datasketches-cpp] branch no_lib_makefiles created (now
c40456e)
This is an automated email from the ASF dual-hosted git repository.
alsay pushed a change to branch no_lib_makefiles
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git.
at c40456e not building shared library anymore
This branch includes the following new commits:
new c40456e not building shared library anymore
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-cpp] 01/01: not building shared library
anymore
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alsay pushed a commit to branch no_lib_makefiles
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
commit c40456e2ca4027820091c2603db71c7b569638ac
Author: AlexanderSaydakov <Al...@users.noreply.github.com>
AuthorDate: Tue Jan 21 16:50:11 2020 -0800
not building shared library anymore
---
Makefile | 19 +++----------------
config.mk | 14 +-------------
cpc/cpc.mk | 26 +++-----------------------
fi/fi.mk | 5 ++---
hll/hll.mk | 3 +--
kll/kll.mk | 5 ++---
theta/theta.mk | 5 ++---
7 files changed, 14 insertions(+), 63 deletions(-)
diff --git a/Makefile b/Makefile
index 505f5c9..b2615d0 100644
--- a/Makefile
+++ b/Makefile
@@ -20,24 +20,18 @@ include config.mk
TEST_BINARY_INPUT_PATH = test
BUILDDIR := build
-TARGETDIR := lib
-
-LIB_BASE_NAME := datasketches
-LIBRARY := lib$(LIB_BASE_NAME).$(LIB_SUFFIX)
-TARGET := $(TARGETDIR)/$(LIBRARY)
INC := -I /usr/local/include
-LIB := -L /usr/local/lib -lcppunit -L lib -l$(LIB_BASE_NAME)
+LIB := -L /usr/local/lib -lcppunit
MODULES := cpc kll fi theta hll
.PHONY: all
-all: $(MODULES) $(LIBRARY)
+all: test
include common/common.mk
INCLIST := $(COM_INCLIST)
-OBJECTS := $(COM_OBJECTS)
# pull in configs for each of the specified modules
define MODULETASKS
@@ -46,21 +40,14 @@ endef
$(foreach MODULE,$(MODULES),$(eval $(call MODULETASKS,$(MODULE))))
INCLIST += $(foreach mod, $(MODULES), $($(shell echo $(mod) | tr a-z A-Z)_INCLIST))
-OBJECTS += $(foreach mod, $(MODULES), $($(shell echo $(mod) | tr a-z A-Z)_OBJECTS))
TEST_MODULES := common_test $(addsuffix _test, $(MODULES))
CLEAN_MODULES := common_clean $(addsuffix _clean, $(MODULES))
EXEC_MODULES := $(addsuffix _exec, $(MODULES))
-$(LIBRARY): $(OBJECTS)
- @mkdir -p $(TARGETDIR)
- @echo "Linking $(LIBRARY)"
- @$(CC) $^ $(LINKFLAGS) $(CPPFLAGS) -o $@
- @mv $(LIBRARY) $(TARGETDIR)
-
.PHONY: test clean
-test: $(LIBRARY) $(TEST_MODULES) $(EXEC_MODULES)
+test: $(TEST_MODULES) $(EXEC_MODULES)
clean: $(CLEAN_MODULES)
@echo "Cleaning $(TARGET)..."
diff --git a/config.mk b/config.mk
index 8bb7213..9cf9054 100644
--- a/config.mk
+++ b/config.mk
@@ -20,11 +20,8 @@
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
CC := clang++ -arch x86_64
- #CC := g++-8
- LIB_SUFFIX := dylib
else
CC := g++
- LIB_SUFFIX := so
endif
COMMON_FLAGS := -O3 -fpic -Wall -pedantic -g0
@@ -32,25 +29,16 @@ COMMON_FLAGS := -O3 -fpic -Wall -pedantic -g0
ifeq ($(UNAME_S),Linux)
CFLAGS += -std=gnu++11 -fPIC
CPPFLAGS += -std=gnu++11 -fPIC
- LINKFLAGS := -shared
-
- # PostgreSQL Special
- #PG_VER := 9.3
- #INC += -I /usr/pgsql-$(PG_VER)/include
- #LIB += -L /usr/pgsql-$(PG_VER)/lib
else
CFLAGS += -x c $(COMMON_FLAGS)
CPPFLAGS += -std=c++11 $(COMMON_FLAGS)
ifeq (clang,$(findstring clang,$(CC)))
- LINKFLAGS := -dynamiclib
CPPFLAGS += -stdlib=libc++
- else
- LINKFLAGS := -shared
endif
endif
-TSTLNKFLAGS := -Wl,-rpath=/usr/local/lib
+#TSTLNKFLAGS := -Wl,-rpath=/usr/local/lib
ifeq ($(COVERAGE),1)
#ifeq (clang,$(findstring clang,$(CC)))
diff --git a/cpc/cpc.mk b/cpc/cpc.mk
index 9c4f189..3b74843 100644
--- a/cpc/cpc.mk
+++ b/cpc/cpc.mk
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-CPC_SRCDIR := cpc/src
CPC_INCDIR := cpc/include
CPC_BUILDDIR := build/cpc
@@ -25,29 +24,10 @@ CPC_TSTBUILD := cpc/build
CPC_TEST_BIN := cpc_test
CPC_TARGET := cpc/$(CPC_TEST_BIN)
-CPC_CSOURCES := $(shell find $(CPC_SRCDIR) -type f -name "*.c")
-CPC_CPPSOURCES := $(shell find $(CPC_SRCDIR) -type f -name "*.cpp")
-CPC_SOURCES := $(CPC_CSOURCES) $(CPC_CPPSOURCES)
-CPC_OBJECTS := $(patsubst $(CPC_SRCDIR)/%,$(CPC_BUILDDIR)/%,$(CPC_CSOURCES:.c=.o) $(CPC_CPPSOURCES:.cpp=.o))
-
CPC_TSTSOURCES := $(shell find $(CPC_TSTDIR) -type f -name "*.cpp")
CPC_TSTOBJS := $(patsubst $(CPC_TSTDIR)/%,$(CPC_TSTBUILD)/%,$(CPC_TSTSOURCES:.cpp=.o))
-CPC_INCLIST := $(COM_INCLIST) $(patsubst $(CPC_SRCDIR)/%,-I $(CPC_SRCDIR)/%,$(CPC_INCDIR))
CPC_INCLIST := $(COM_INCLIST) -I $(CPC_INCDIR)
-CPC_BUILDLIST := $(patsubst src/%,$(CPC_BUILDDIR)/%,$(CPC_INCDIR))
-
-cpc: $(CPC_OBJECTS)
-
-$(CPC_BUILDDIR)/%.o: $(CPC_SRCDIR)/%.cpp
- @mkdir -p $(CPC_BUILDDIR)
- @echo "Compiling $<...";
- @$(CC) $(CPPFLAGS) $(INC) $(CPC_INCLIST) -c -o $@ $<
-
-$(CPC_BUILDDIR)/%.o: $(CPC_SRCDIR)/%.c
- @mkdir -p $(CPC_BUILDDIR)
- @echo "Compiling $<...";
- @$(CC) $(CFLAGS) $(INC) $(CPC_INCLIST) -c -o $@ $<
$(CPC_TSTBUILD)/%.o: $(CPC_TSTDIR)/%.cpp
@mkdir -p $(CPC_TSTBUILD)
@@ -55,12 +35,12 @@ $(CPC_TSTBUILD)/%.o: $(CPC_TSTDIR)/%.cpp
@$(CC) $(CPPFLAGS) $(INC) $(CPC_INCLIST) -c -o $@ $<
.PHONY: cpc_test cpc_clean
-cpc_exec: $(COM_TSTOBJS) $(CPC_OBJECTS) $(CPC_TSTOBJS)
+cpc_exec: $(COM_TSTOBJS) $(CPC_TSTOBJS)
@echo "Linking $(CPC_TARGET)..."
@$(CC) $^ -o $(CPC_TARGET) $(TSTLNKFLAGS) $(LIB)
-cpc_test: $(LIBRARY) cpc_exec
- @cd cpc; LD_LIBRARY_PATH=../$(TARGETDIR) ./$(CPC_TEST_BIN)
+cpc_test: cpc_exec
+ @cd cpc; ./$(CPC_TEST_BIN)
cpc_clean:
@echo "Cleaning cpc...";
diff --git a/fi/fi.mk b/fi/fi.mk
index 85ef3df..12250fa 100644
--- a/fi/fi.mk
+++ b/fi/fi.mk
@@ -40,9 +40,8 @@ fi_exec: $(COM_TSTOBJS) $(FI_TSTOBJS)
@$(CC) $^ -o $(FI_TARGET) $(TSTLNKFLAGS) $(LIB)
fi_test: fi_exec
- @cd fi; LD_LIBRARY_PATH=../$(TARGETDIR) ./$(FI_TEST_BIN)
+ @cd fi; ./$(FI_TEST_BIN)
-.PHONY: fi_clean
fi_clean:
@echo "Cleaning fi...";
- @$(RM) -r $(FI_TSTBUILD) $(FI_TARGET) $(FI_TARGET)
+ @$(RM) -r $(FI_BUILDDIR) $(FI_TSTBUILD) $(FI_TARGET)
diff --git a/hll/hll.mk b/hll/hll.mk
index 97145f3..d08dbca 100644
--- a/hll/hll.mk
+++ b/hll/hll.mk
@@ -40,9 +40,8 @@ hll_exec: $(COM_TSTOBJS) $(HLL_TSTOBJS)
@$(CC) $^ -o $(HLL_TARGET) $(TSTLNKFLAGS) $(LIB)
hll_test: hll_exec
- @cd hll; LD_LIBRARY_PATH=../$(TARGETDIR) ./$(HLL_TEST_BIN)
+ @cd hll; ./$(HLL_TEST_BIN)
-.PHONY: hll_clean
hll_clean:
@echo "Cleaning hll...";
@$(RM) -r $(HLL_BUILDDIR) $(HLL_TSTBUILD) $(HLL_TARGET)
diff --git a/kll/kll.mk b/kll/kll.mk
index 968fc40..eb8091d 100644
--- a/kll/kll.mk
+++ b/kll/kll.mk
@@ -40,9 +40,8 @@ kll_exec: $(COM_TSTOBJS) $(KLL_TSTOBJS)
@$(CC) $^ -o $(KLL_TARGET) $(TSTLNKFLAGS) $(LIB)
kll_test: kll_exec
- @cd kll; LD_LIBRARY_PATH=../$(TARGETDIR) ./$(KLL_TEST_BIN)
+ @cd kll; ./$(KLL_TEST_BIN)
-.PHONY: kll_clean
kll_clean:
@echo "Cleaning kll...";
- @$(RM) -r $(KLL_TSTBUILD) $(KLL_TARGET) $(KLL_TARGET)
+ @$(RM) -r $(KLL_BUILDDIR) $(KLL_TSTBUILD) $(KLL_TARGET)
diff --git a/theta/theta.mk b/theta/theta.mk
index 77a5051..915152c 100644
--- a/theta/theta.mk
+++ b/theta/theta.mk
@@ -40,9 +40,8 @@ theta_exec: $(COM_TSTOBJS) $(THETA_TSTOBJS)
@$(CC) $^ -o $(THETA_TARGET) $(TSTLNKFLAGS) $(LIB)
theta_test: theta_exec
- @cd theta; LD_LIBRARY_PATH=../$(TARGETDIR) ./$(THETA_TEST_BIN)
+ @cd theta; ./$(THETA_TEST_BIN)
-.PHONY: theta_clean
theta_clean:
@echo "Cleaning theta...";
- @$(RM) -r $(THETA_TSTBUILD) $(THETA_TARGET) $(THETA_TARGET)
+ @$(RM) -r $(THETA_BUILDDIR) $(THETA_TSTBUILD) $(THETA_TARGET)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org