one shared lib

Author: deepfryed

beanstalk.h

@@ -41,43 +41,60 @@ typedef struct bs_job {
 // fd: file descriptor of the socket
 typedef int (*bs_poll_function)(int rw, int fd);
 
+/*  Handle DSO symbol visibility - Stolen from zmq.h */
+#if defined _WIN32
+#   if defined DLL_EXPORT
+#       define BSC_EXPORT __declspec(dllexport)
+#   else
+#       define BSC_EXPORT __declspec(dllimport)
+#   endif
+#else
+#   if defined __SUNPRO_C  || defined __SUNPRO_CC
+#       define BSC_EXPORT __global
+#   elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#       define BSC_EXPORT __attribute__ ((visibility("default")))
+#   else
+#       define BSC_EXPORT
+#   endif
+#endif
+
 // polling setup
-void bs_start_polling(bs_poll_function f);
-void bs_reset_polling(void);
+BSC_EXPORT void bs_start_polling(bs_poll_function f);
+BSC_EXPORT void bs_reset_polling(void);
 
 // returns a descriptive text of the error code.
-const char* bs_status_text(int code);
+BSC_EXPORT const char* bs_status_text(int code);
 
-void bs_free_message(BSM* m);
-void bs_free_job(BSJ *job);
+BSC_EXPORT void bs_free_message(BSM* m);
+BSC_EXPORT void bs_free_job(BSJ *job);
 
 // returns socket descriptor or BS_STATUS_FAIL
-int bs_connect(char *host, int port);
+BSC_EXPORT int bs_connect(char *host, int port);
 // returns job id or one of the negative failure codes.
-int bs_put(int fd, int priority, int delay, int ttr, char *data, size_t bytes);
+BSC_EXPORT int bs_put(int fd, int priority, int delay, int ttr, char *data, size_t bytes);
 
 // rest return BS_STATUS_OK or one of the failure codes.
-int bs_disconnect(int fd);
-int bs_use(int fd, char *tube);
-int bs_watch(int fd, char *tube);
-int bs_ignore(int fd, char *tube);
-int bs_delete(int fd, int job);
-int bs_reserve(int fd, BSJ **job);
-int bs_reserve_with_timeout(int fd, int ttl, BSJ **job);
-int bs_release(int fd, int id, int priority, int delay);
-int bs_bury(int fd, int id, int priority);
-int bs_touch(int fd, int id);
-int bs_peek(int fd, int id, BSJ **job);
-int bs_peek_ready(int fd, BSJ **job);
-int bs_peek_delayed(int fd, BSJ **job);
-int bs_peek_buried(int fd, BSJ **job);
-int bs_kick(int fd, int bound);
-int bs_list_tube_used(int fd, char **tube);
-int bs_list_tubes(int fd, char **yaml);
-int bs_list_tubes_watched(int fd, char **yaml);
-int bs_stats(int fd, char **yaml);
-int bs_stats_job(int fd, int id, char **yaml);
-int bs_stats_tube(int fd, char *tube, char **yaml);
+BSC_EXPORT int bs_disconnect(int fd);
+BSC_EXPORT int bs_use(int fd, char *tube);
+BSC_EXPORT int bs_watch(int fd, char *tube);
+BSC_EXPORT int bs_ignore(int fd, char *tube);
+BSC_EXPORT int bs_delete(int fd, int job);
+BSC_EXPORT int bs_reserve(int fd, BSJ **job);
+BSC_EXPORT int bs_reserve_with_timeout(int fd, int ttl, BSJ **job);
+BSC_EXPORT int bs_release(int fd, int id, int priority, int delay);
+BSC_EXPORT int bs_bury(int fd, int id, int priority);
+BSC_EXPORT int bs_touch(int fd, int id);
+BSC_EXPORT int bs_peek(int fd, int id, BSJ **job);
+BSC_EXPORT int bs_peek_ready(int fd, BSJ **job);
+BSC_EXPORT int bs_peek_delayed(int fd, BSJ **job);
+BSC_EXPORT int bs_peek_buried(int fd, BSJ **job);
+BSC_EXPORT int bs_kick(int fd, int bound);
+BSC_EXPORT int bs_list_tube_used(int fd, char **tube);
+BSC_EXPORT int bs_list_tubes(int fd, char **yaml);
+BSC_EXPORT int bs_list_tubes_watched(int fd, char **yaml);
+BSC_EXPORT int bs_stats(int fd, char **yaml);
+BSC_EXPORT int bs_stats_job(int fd, int id, char **yaml);
+BSC_EXPORT int bs_stats_tube(int fd, char *tube, char **yaml);
 
 #ifdef __cplusplus
     }

makefile

@@ -6,11 +6,9 @@ CEXAMPLES   := $(SOURCES2:%.c=%)
 CPPEXAMPLES := $(SOURCES3:%.cc=%)
 
 VERSION      = 1.0.0
-CSHAREDLIB   = libbeanstalk.so
-CPPSHAREDLIB = libbeanstalkcpp.so
+SHAREDLIB    = libbeanstalk.so
 CFLAGS       = -Wall -g -I.
-CLDFLAGS     = -L. -lbeanstalk
-CPPLDFLAGS   = -L. -lbeanstalkcpp
+LDFLAGS      = -L. -lbeanstalk
 CC           = gcc
 CPP          = g++
 
@@ -19,51 +17,44 @@ all: $(CEXAMPLES) $(CPPEXAMPLES)
 test: $(TESTS)
 	test/run-all
 
-$(TESTS): test/%:test/%.o libbeanstalk.so
-	$(CPP) -o $@ $< $(CLDFLAGS) -lgtest -lpthread
+$(TESTS): test/%:test/%.o $(SHAREDLIB)
+	$(CPP) -o $@ $< $(LDFLAGS) -lgtest -lpthread
 
 test/%.o: test/%.cc
 	$(CPP) $(CFLAGS) -c -o $@ $<
 
 $(CEXAMPLES): examples/c/%:examples/c/%.o libbeanstalk.so
-	$(CC) -o $@ $< $(CLDFLAGS)
+	$(CC) -o $@ $< $(LDFLAGS)
 
 examples/c/%.o: examples/c/%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(CPPEXAMPLES): examples/cpp/%:examples/cpp/%.o libbeanstalkcpp.so
-	$(CPP) -o $@ $< $(CPPLDFLAGS)
+$(CPPEXAMPLES): examples/cpp/%:examples/cpp/%.o libbeanstalk.so
+	$(CPP) -o $@ $< $(LDFLAGS)
 
 examples/cpp/%.o: examples/cpp/%.cc
 	$(CPP) $(CFLAGS) -c -o $@ $<
 
-$(CSHAREDLIB): beanstalk.o
-	$(CC) -shared -o $(CSHAREDLIB) beanstalk.o
+$(SHAREDLIB): beanstalk.o beanstalkcpp.o
+	$(CPP) -shared -o $(SHAREDLIB) beanstalk.o beanstalkcpp.o
 
 beanstalk.o: beanstalk.c beanstalk.h makefile
 	$(CC) $(CFLAGS) -fPIC -c -o beanstalk.o beanstalk.c
 
-$(CPPSHAREDLIB): beanstalkcpp.o beanstalk.o
-	$(CPP) -shared -o $(CPPSHAREDLIB) beanstalkcpp.o beanstalk.o
-
 beanstalkcpp.o: beanstalk.cc beanstalk.hpp makefile
 	$(CPP) $(CFLAGS) -fPIC -c -o beanstalkcpp.o beanstalk.cc
 
-install: $(CSHAREDLIB) $(CPPSHAREDLIB)
+install: $(SHAREDLIB)
 	cp beanstalk.h /usr/include
 	cp beanstalk.hpp /usr/include
-	cp $(CSHAREDLIB) /usr/lib/$(CSHAREDLIB).$(VERSION)
-	ln -sfT /usr/lib/$(CSHAREDLIB).$(VERSION) /usr/lib/$(CSHAREDLIB).1
-	ln -sfT /usr/lib/$(CSHAREDLIB).$(VERSION) /usr/lib/$(CSHAREDLIB)
-	cp $(CPPSHAREDLIB) /usr/lib/$(CPPSHAREDLIB).$(VERSION)
-	ln -sfT /usr/lib/$(CPPSHAREDLIB).$(VERSION) /usr/lib/$(CPPSHAREDLIB).1
-	ln -sfT /usr/lib/$(CPPSHAREDLIB).$(VERSION) /usr/lib/$(CPPSHAREDLIB)
+	cp $(SHAREDLIB) /usr/lib/$(SHAREDLIB).$(VERSION)
+	ln -sfT /usr/lib/$(SHAREDLIB).$(VERSION) /usr/lib/$(SHAREDLIB).1
+	ln -sfT /usr/lib/$(SHAREDLIB).$(VERSION) /usr/lib/$(SHAREDLIB)
 
 uninstall:
 	rm -f /usr/include/beanstalk.h
 	rm -f /usr/include/beanstalk.hpp
-	rm -f /usr/lib/$(CSHAREDLIB)*
-	rm -f /usr/lib/$(CPPSHAREDLIB)*
+	rm -f /usr/lib/$(SHAREDLIB)*
 
 clean:
 	rm -f *.o *.so *.so.* test/test[0-9] test/*.o examples/**/*.o examples/**/example?