aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Krahl <me@robin-krahl.de>2017-03-23 23:42:57 +0100
committerRobin Krahl <me@robin-krahl.de>2017-03-23 23:42:57 +0100
commite1d6684a7adbf29130411f2a030d01b594a95ca1 (patch)
treeeda1a7fa75320f4496c36859333e29247c19cf6f
parentcbe3dc9f40aaab8a2ff641ce824766b41d1d407c (diff)
downloadsqlitepp-e1d6684a7adbf29130411f2a030d01b594a95ca1.tar.gz
sqlitepp-e1d6684a7adbf29130411f2a030d01b594a95ca1.tar.bz2
Move sources directly to src and rename to .cpp.
-rw-r--r--Makefile15
-rw-r--r--src/sqlitepp.cpp (renamed from src/sqlitepp/sqlitepp.cc)0
-rw-r--r--src/sqlitepp_test.cpp (renamed from src/sqlitepp/sqlitepp_test.cc)0
3 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 3882de1..3cac760 100644
--- a/Makefile
+++ b/Makefile
@@ -7,16 +7,16 @@ LIBRARY_DIR := lib
BINARY_DIR := bin
DOCUMENTATION_DIR := doc
-SOURCE_NAMES_LIB := sqlitepp.cc
-SOURCE_NAMES_TEST := sqlitepp_test.cc
+SOURCE_NAMES_LIB := sqlitepp.cpp
+SOURCE_NAMES_TEST := sqlitepp_test.cpp
TARGETS := $(LIBRARY_DIR)/libsqlitepp.so $(BINARY_DIR)/sqlitepp_test
-SOURCES_LIB := $(foreach source,$(SOURCE_NAMES_LIB),$(SOURCE_DIR)/sqlitepp/$(source))
-OBJECTS_LIB := $(SOURCES_LIB:$(SOURCE_DIR)/%.cc=$(OBJECT_DIR)/%.o)
+SOURCES_LIB := $(foreach source,$(SOURCE_NAMES_LIB),$(SOURCE_DIR)/$(source))
+OBJECTS_LIB := $(SOURCES_LIB:$(SOURCE_DIR)/%.cpp=$(OBJECT_DIR)/%.o)
DEPENDS_LIB := $(OBJECTS_LIB:.o=.d)
-SOURCES_TEST := $(foreach source,$(SOURCE_NAMES_TEST),$(SOURCE_DIR)/sqlitepp/$(source))
-OBJECTS_TEST := $(SOURCES_TEST:$(SOURCE_DIR)/%.cc=$(OBJECT_DIR)/%.o)
+SOURCES_TEST := $(foreach source,$(SOURCE_NAMES_TEST),$(SOURCE_DIR)/$(source))
+OBJECTS_TEST := $(SOURCES_TEST:$(SOURCE_DIR)/%.cpp=$(OBJECT_DIR)/%.o)
DEPENDS_TEST := $(OBJECTS_TEST:.o=.d)
INCLUDES := $(INCLUDE_DIR)/sqlitepp/sqlitepp.h
@@ -61,10 +61,9 @@ $(BINARY_DIR)/sqlitepp_test: $(OBJECTS_TEST)
$(QUIET)mkdir -p $(BINARY_DIR)
$(QUIET)$(CXX) $(LDFLAGS) $(LDFLAGS_TEST) $< -o $@
-$(OBJECTS): $(OBJECT_DIR)/%.o: $(SOURCE_DIR)/%.cc
+$(OBJECTS): $(OBJECT_DIR)/%.o: $(SOURCE_DIR)/%.cpp
$(info (CXX) $@)
$(QUIET)mkdir -p $(OBJECT_DIR)
- $(QUIET)mkdir -p $(OBJECT_DIR)/sqlitepp
$(QUIET)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
-include $(DEPENDS)
diff --git a/src/sqlitepp/sqlitepp.cc b/src/sqlitepp.cpp
index ef0dfa8..ef0dfa8 100644
--- a/src/sqlitepp/sqlitepp.cc
+++ b/src/sqlitepp.cpp
diff --git a/src/sqlitepp/sqlitepp_test.cc b/src/sqlitepp_test.cpp
index dfa46d4..dfa46d4 100644
--- a/src/sqlitepp/sqlitepp_test.cc
+++ b/src/sqlitepp_test.cpp