Forráskód Böngészése

Updated makefile help

Thomas Davis 12 éve
szülő
commit
00cf3c423f
1 módosított fájl, 38 hozzáadás és 17 törlés
  1. 38 17
      Makefile

+ 38 - 17
Makefile

@@ -3,6 +3,10 @@
 # License http://opensource.org/licenses/mit-license.php MIT License
 #
 
+#
+# For help try, "make help"
+#
+
 include build/Makefile.in-os
 
 CPROG = civetweb
@@ -38,6 +42,22 @@ ifdef WITH_WEBSOCKET
   CFLAGS += -DUSE_WEBSOCKET
 endif
 
+ifdef CONFIG_FILE
+  CFLAGS += -DCONFIG_FILE=\"$(CONFIG_FILE)\"
+endif
+
+ifdef CONFIG_FILE2
+  CFLAGS += -DCONFIG_FILE2=\"$(CONFIG_FILE2)\"
+endif
+
+ifdef SSL_LIB
+  CFLAGS += -DSSL_LIB=\"$(SSL_LIB)\"
+endif
+
+ifdef CRYPTO_LIB
+  CFLAGS += -DCRYPTO_LIB=\"$(CRYPTO_LIB)\"
+endif
+
 BUILD_DIRS += $(addprefix $(BUILD_DIR)/, $(SOURCE_DIRS))
 BUILD_OBJECTS = $(addprefix $(BUILD_DIR)/, $(OBJECTS))
 
@@ -47,33 +67,34 @@ ifeq ($(TARGET_OS),LINUX)
 	LIBS += -ldl
 endif
 
-all: help
+all: build
 
 help:
-	@echo "make help         show this message"
-	@echo "make build        compile"
-	@echo "make install      install on the system"
-	@echo "make clean        clean up the mess"
+	@echo "make help                show this message"
+	@echo "make build               compile"
+	@echo "make install             install on the system"
+	@echo "make clean               clean up the mess"
 	@echo ""
-	@echo "Make Options"
-	@echo "   WITH_LUA=1         build with LUA support"
-	@echo "   WITH_DEBUG=1       build with GDB debug support"
-	@echo "   WITH_IPV6=1        with IPV6 support"
-	@echo "   WITH_WEBSOCKET=1   build with web socket support"
-	@echo "   COPT=\"-DNO_SSL\"    method to insert additional options"
-	@echo "   INSTALL_DIR=/      sets the install directory"
+	@echo " Make Options"
+	@echo "   WITH_LUA=1            build with LUA support"
+	@echo "   WITH_DEBUG=1          build with GDB debug support"
+	@echo "   WITH_IPV6=1           with IPV6 support"
+	@echo "   WITH_WEBSOCKET=1      build with web socket support"
+	@echo "   CONFIG_FILE=file      use 'file' as the config file"
+	@echo "   CONFIG_FILE2=file     use 'file' as the backup config file"
+	@echo "   SSL_LIB=libssl.so.0   use versioned SSL library"
+	@echo "   CRYPTO_LIB=libcrypto.so.0 system versioned CRYPTO library"
+	@echo "   INSTALL_DIR=/         sets the install directory"
+	@echo "   COPT='-DNO_SSL'       method to insert compile flags"
 	@echo ""
-	@echo "Compile Flags"
+	@echo " Compile Flags"
 	@echo "   NDEBUG                strip off all debug code"
 	@echo "   DEBUG                 build debug version (very noisy)"
 	@echo "   NO_CGI                disable CGI support"
 	@echo "   NO_SSL                disable SSL functionality"
 	@echo "   NO_SSL_DL             link against system libssl library"
-	@echo "   CONFIG_FILE=\"file\"  use 'file' as the config file"
-	@echo "   SSL_LIB=\"libssl.so.<version>\"   use system versioned SSL shared object"
-	@echo "   CRYPTO_LIB=\"libcrypto.so.<version>\" use system versioned CRYPTO so"
 	@echo ""
-	@echo "Variables"
+	@echo " Variables"
 	@echo "   TARGET_OS='$(TARGET_OS)'"
 	@echo "   CFLAGS='$(CFLAGS)'"
 	@echo "   CXXFLAGS='$(CXXFLAGS)'"