C binding for lmctfy

Makefile

@@ -13,15 +13,17 @@ OPT ?= -O2 -DNDEBUG       # (A) Production use (optimized mode)
 # Use default if no configuration specified.
 CXX ?= g++
 AR ?= ar
+CC ?= gcc
 
 # Version number of lmctfy.
 VERSION = "\"0.4.5\""
 
 # TODO(vmarmol): Ensure our dependencies are installed
 PROTOC = protoc
+PROTOC_C = protoc-c
 
 # Function for getting a set of source files.
-get_srcs = $(shell find $(1) -name \*.cc -a ! -name \*_test.cc | tr "\n" " ")
+get_srcs = $(shell find $(1) -name \*.cc -a ! -name \*_test.cc -a ! -name \*_ctest.cc | tr "\n" " ")
 
 INCLUDE_PROTOS = include/virtual_host include/lmctfy include/namespaces
 UTIL_PROTOS = util/task/codes
@@ -37,6 +39,8 @@ LIBLMCTFY_SOURCES =$(shell find lmctfy/ -name \*.cc -a ! -name \*_test.cc \
 CLI_SOURCES = $(call get_srcs,lmctfy/cli/)
 NSINIT_SOURCES = nscon/init.cc nscon/init_impl.cc
 NSCON_SOURCES = $(filter-out $(NSINIT_SOURCES),$(call get_srcs,nscon/))
+CPROTOS_SOURCES = $(addsuffix .pb-c.c,$(INCLUDE_PROTOS)) $(addsuffix .pb.cc,$(UTIL_PROTOS))
+LIBCLMCTFY_SOURCES = $(call get_srcs,clmctfy/) $(CPROTOS_SOURCES)
 
 # The objects for the system API (both release and test versions).
 SYSTEM_API_OBJS = global_utils/mount_utils.o \
@@ -61,6 +65,7 @@ SYSTEM_API_TEST_OBJS = global_utils/mount_utils_test_util.o \
 # Gets all *_test.cc files in lmtcfy/.
 TESTS = $(basename $(shell find lmctfy/ nscon/ -name \*_test.cc \
 	-a ! -name \*_integration_test.cc))
+CLMCTFY_TESTS = $(basename $(shell find clmctfy/ -name \*_ctest.cc))
 
 # Where to place the binary outputs.
 OUT_DIR = bin
@@ -96,15 +101,32 @@ CXXFLAGS += -pthread -lrt -lre2 -lgflags
 CXXFLAGS += -I. -I./include -I./base -I./lmctfy -I$(GTEST_DIR)/include \
 	    -I$(GMOCK_DIR)/include -I/usr/local/include -L/usr/local/lib \
 	    -I/usr/include -L/usr/lib
+# Add include for c binding
+CXXFLAGS += -I./clmctfy
 
 # Add proto flags.
 CXXFLAGS += `pkg-config --cflags --libs protobuf`
 
+# Add proto-c flags.
+CXXFLAGS += -lprotobuf-c
+
+# flags for linker
+LDFLAGS = -lprotobuf-c
+LDFLAGS += `pkg-config --cflags --libs protobuf`
+LDFLAGS += -lpthread
+LDFLAGS += -pthread
+LDFLAGS += -lrt -lre2 -lgflags -lm
+
+# linker's flag for C bindings
+CLDFLAGS = -lstdc++
+
+
 CLI = lmctfy
 NSCON = lmctfy-nscon
 NSINIT = lmctfy-nsinit
 LIBRARY = liblmctfy.a
 CREAPER = lmctfy-creaper
+CLIBRARY = libclmctfy.a
 
 # Function for ensuring the output directory has been created.
 create_bin = mkdir -p $(dir $(OUT_DIR)/$@)
@@ -128,6 +150,8 @@ install: all
 	chmod +x /usr/local/bin/$(NSINIT)
 	cp ./bin/$(CREAPER) /usr/local/bin
 	chmod +x /usr/local/bin/$(CREAPER)
+
+cbinding: $(CLIBRARY) checkc
 
 TEST_TMPDIR = "/tmp/lmctfy_test.$$"
 check: $(TESTS)
@@ -141,6 +165,16 @@ check: $(TESTS)
 	rm -rf $(TEST_TMPDIR)
 	echo "All tests pass!"
 
+checkc: $(CLMCTFY_TESTS)
+	for t in $(addprefix $(OUT_DIR)/,$^); \
+		do \
+			echo "***** Running $$t"; \
+			rm -rf $(TEST_TMPDIR); \
+			mkdir $(TEST_TMPDIR); \
+			./$$t --test_tmpdir=$(TEST_TMPDIR); \
+		done; \
+	rm -rf $(TEST_TMPDIR)
+
 clean:
 	-rm -rf $(OUT_DIR)
 	-rm -f `find . -type f -name '*.pb.*'`
@@ -152,9 +186,16 @@ examples/simple_existing: examples/simple_existing.o $(LIBRARY)
 # All common base sources (non-lmctfy and non-nscon).
 COMMON_SOURCES = $(INCLUDE_SOURCES) $(BASE_SOURCES) $(STRINGS_SOURCES) \
 		 $(FILE_SOURCES) $(THREAD_SOURCES) $(UTIL_SOURCES)
+examples/clmctfy_simple_existing: examples/clmctfy_simple_existing.o $(CLIBRARY)
+	$(create_bin)
+	$(CC) -o $(OUT_DIR)/$@ $(addprefix $(OUT_DIR)/,$^) $(LDFLAGS) $(CLDFLAGS)
 
 # All sources needed by the library (minus the system API).
 LIBRARY_SOURCES = $(COMMON_SOURCES) $(LIBLMCTFY_SOURCES) $(NSCON_SOURCES)
+CLIBRARY_ONLY_SOURCES = $(INCLUDE_SOURCES) $(BASE_SOURCES) $(LIBCLMCTFY_SOURCES) \
+			$(STRINGS_SOURCES) $(FILE_SOURCES) $(THREAD_SOURCES) \
+			$(UTIL_SOURCES)
+CLIBRARY_SOURCES = $(LIBRARY_SOURCES) $(LIBCLMCTFY_SOURCES)
 
 
 # The lmctfy library without the system API. This is primarily an internal
@@ -163,11 +204,19 @@ lmctfy_no_system_api.a: $(call source_to_object,$(LIBRARY_SOURCES))
 	$(create_bin)
 	$(archive_all)
 
+clmctfy_only_api.a: $(call source_to_object,$(CLIBRARY_ONLY_SOURCES))
+	$(create_bin)
+	$(archive_all)
+
 # The lmctfy library with the real system API.
 $(LIBRARY): $(call source_to_object,$(LIBRARY_SOURCES)) $(SYSTEM_API_OBJS)
 	$(create_bin)
 	$(archive_all)
 
+$(CLIBRARY): $(call source_to_object,$(CLIBRARY_SOURCES)) $(SYSTEM_API_OBJS)
+	$(create_bin)
+	$(archive_all)
+
 # Objects of the lmctfy CLI.
 lmctfy_cli.a: $(call source_to_object,$(CLI_SOURCES))
 	$(create_bin)
@@ -204,19 +253,41 @@ $(CREAPER): lmctfy-creaper.go
 	$(CXX) -o $(OUT_DIR)/$@ $*.cc $*_test.cc $(addprefix $(OUT_DIR)/,$^) \
 		$(CXXFLAGS)
 
+%_ctest: gtest_main.a $(SYSTEM_API_TEST_OBJS) clmctfy_only_api.a
+	$(create_bin)
+	$(CXX) -o $(OUT_DIR)/$@ $*.cc $*_ctest.cc $(addprefix $(OUT_DIR)/,$^) \
+		$(CXXFLAGS) -fpermissive
+
 %_proto: %.proto
 	$(PROTOC) $^ --cpp_out=.
+	$(PROTOC_C) $^ --c_out=$(dir $^) --proto_path=$(dir $^):.
 
 %.pb.o: %_proto
 	$(create_bin)
 	$(CXX) -c $*.pb.cc -o $(OUT_DIR)/$@ $(CXXFLAGS)
 
+%.pb-c.o: %_proto
+	$(create_bin)
+	$(CXX) -c $*.pb-c.c -o $(OUT_DIR)/$@ $(CXXFLAGS) -fpermissive
+
 gen_protos: $(addsuffix _proto,$(INCLUDE_PROTOS) $(UTIL_PROTOS))
 
+%_ctest.o: gen_protos %_ctest.cc
+	$(create_bin)
+	$(CXX) -c $*.cc -o $(OUT_DIR)/$@ $(CXXFLAGS) -fpermissive
+
+%.o: gen_protos %.c
+	$(create_bin)
+	$(CC) -c $*.c -o $(OUT_DIR)/$@ $(CXXFLAGS)
+
 %.o: gen_protos %.cc
 	$(create_bin)
 	$(CXX) -c $*.cc -o $(OUT_DIR)/$@ $(CXXFLAGS)
 
+%.o: %.pb-c.c
+	$(create_bin)
+	$(CXX) -c $*.c -o $(OUT_DIR)/$@ $(CXXFLAGS)
+
 # Rules for Building Google Test and Google Mock (based on gmock's example).
 
 # All Google Test headers.  Usually you shouldn't change this definition.