- Added some missing newlines at end of files

- Modified Makefiles to produce a shared library
- Added SingletonDll Makefile


git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@581 7ec92016-0320-0410-acc4-a06ded1c099a

Makefile

@@ -1,14 +1,20 @@
-.PHONY: build check install clean-tmp clean
+.PHONY: build-static build-shared check install clean-tmp clean
-build:
+build-static:
-	$(MAKE) -C src
+	$(MAKE) -C src build-static
 
-check: build
+build-shared:
+	$(MAKE) -C src build-shared
+
+check: build-static
 	$(MAKE) -C test
 
 install:
-	$(MAKE) -C src install
+	$(MAKE) -C src install-static
 	$(MAKE) -C include install
 
+install-shared:
+	$(MAKE) -C src install-shared
+
 clean-tmp:
 	$(MAKE) -C src clean-tmp
 

src/Makefile

@@ -1,24 +1,40 @@
-OBJ = \
+SRC = $(wildcard *.cpp)
-	OrderedStatic.o \
+STATIC_OBJ = $(SRC:.cpp=.o)
-	SafeFormat.o \
+SHARED_OBJ = $(SRC:.cpp=.lo)
-	Singleton.o \
+
-	SmallObj.o \
+LOKI_VERSION = 0.1.4
-	SmartPtr.o
+
-	
+STATIC_LIB = ../lib/libloki.a
-BIN = ../lib/libloki.a
+SHARED_LIB = ../lib/libloki.so.$(LOKI_VERSION)
 CXXFLAGS = -Wall -Wold-style-cast -Wundef -Wsign-compare -Wconversion -Wpointer-arith -pedantic -O2
 CPPFLAGS = -I../include -DNDEBUG
 
-$(BIN): $(OBJ)
+$(STATIC_LIB): $(STATIC_OBJ)
-	ar rs $(BIN) $(OBJ)
+	ar rs $(STATIC_LIB) $(STATIC_OBJ)
 
-.PHONY: install clean-tmp clean
+$(SHARED_LIB): $(SHARED_OBJ)
-install: $(BIN)
+	g++ --shared -Wl,-soname=libloki.so.$(LOKI_VERSION) -o $(SHARED_LIB) $(SHARED_OBJ)
+
+%.lo : %.cpp
+	$(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $<
+
+.PHONY: build-static build-shared install-static install-shared clean-tmp clean
+build-static: $(STATIC_LIB)
+build-shared: $(SHARED_LIB)
+
+install-static: $(STATIC_LIB)
 	mkdir -p $(DESTDIR)/usr/lib
-	install $(BIN) $(DESTDIR)/usr/lib
+	install -m 644 $(STATIC_LIB) $(DESTDIR)/usr/lib
+
+install-shared: $(SHARED_LIB)
+	mkdir -p $(DESTDIR)/usr/lib
+	install -m 644 -s $(SHARED_LIB) $(DESTDIR)/usr/lib
+	cd $(DESTDIR)/usr/lib/; ln -s libloki.so.$(LOKI_VERSION) libloki.so
 
 clean-tmp:
-	rm -f $(OBJ)
+	rm -f $(STATIC_OBJ)
+	rm -f $(SHARED_OBJ)
 
 clean: clean-tmp
-	rm -f $(BIN)
+	rm -f $(STATIC_LIB)
+	rm -f $(SHARED_LIB)

test/SingletonDll/Makefile

@@ -0,0 +1,22 @@
+BIN = client
+LIB1 = libfoo.so
+LIB2 = libsingletondll.so
+CXXFLAGS = -Wall -Wold-style-cast -Wundef -Wsign-compare -Wconversion -Wpointer-arith -pedantic -O2
+CPPFLAGS = -I../../include -DNDEBUG
+LDFLAGS = -L../../lib
+LDLIBS = -lloki
+
+.PHONY: build clean
+build: $(BIN)
+
+$(BIN): $(LIB1) $(LIB2)
+	$(CXX) $(CXXFLAGS) -L. $(LDFLAGS) $(CPPFLAGS) -o $(BIN) client.cpp $(LDLIBS) -lfoo -lsingletondll
+
+$(LIB1): foo.cpp
+	$(CXX) --shared $(CXXFLAGS) $(CPPFLAGS) -o $(LIB1) foo.cpp 
+
+$(LIB2): singletondll.cpp
+	$(CXX) --shared $(CXXFLAGS) $(CPPFLAGS) -o $(LIB2) foo.cpp
+
+clean:
+	rm -f $(BIN) $(LIB1) $(LIB2)

test/SingletonDll/client.cpp

@@ -43,4 +43,4 @@ int main()
 #endif
 
 	return 0;
-}
+}

test/SingletonDll/foo.cpp

@@ -22,4 +22,4 @@ Foo::Foo()
 void Foo::foo()
 {
 	std::cout << "\nFoo:foo() called,  this: " << this << "\n";
-}
+}

test/SingletonDll/foo.h

@@ -27,4 +27,4 @@ public:
 };
 
 
-#endif
+#endif

test/SingletonDll/foo_export.h

@@ -41,4 +41,4 @@
 #endif
 
 
-#endif 
+#endif

test/SingletonDll/singletondll.h

@@ -39,4 +39,4 @@ template class SINGLETONDLL_EXPORT Singleton<Foo>;
 
 
 
-#endif
+#endif

test/SingletonDll/singletondll_export.h

@@ -41,4 +41,4 @@
 #endif
 
 
-#endif 
+#endif