aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 6 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 31bb170..bc55bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -307,29 +307,25 @@ $(BIN_DIR)/$(CLIENTNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
$(BIN_DIR)/$(SERVERNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
$(CP) $^ $@
-$(LNNGDIR)/dynamic : $(LNNGDIR)/CMakeLists.txt
- mkdir $@
+$(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/CMakeLists.txt
+ cd $@ && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
-$(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/dynamic
- cd $< && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
-
-$(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT) $(LNNGDIR)/static
+$(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT)
cp $< $@
-$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) $(LNNGDIR)/dynamic
+$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT)
cp $< $@
-$(LNNGDIR)/static/libnng$(STA_LIB_EXT) : $(LNNGDIR)/static $(LNNGDIR)/static/Makefile
+$(LNNGDIR)/static/libnng$(STA_LIB_EXT) : $(LNNGDIR)/static/Makefile
cd $(LNNGDIR)/static && $(MAKE) nng
-$(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/dynamic $(LNNGDIR)/dynamic/Makefile
+$(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT).a : $(LNNGDIR)/dynamic/Makefile
cd $(LNNGDIR)/dynamic && $(MAKE) nng
$(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt
@echo "LIB_OBJS were $(LIB_OBJS)"
cd $(LNNGDIR) && cmake $(CMAKE_FLAGS) $(NNGCMAKEFLAGS)
-
$(LNNGDIR)/libnng.dll.a : $(LNNGDIR)/Makefile
cd $(LNNGDIR)/dyn_lib && $(MAKE) nng