Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changed from platform if/endif to special vars.

The common case of checking BUILD_FOR_{PLATFORM} for libraries was
changed back to special DYNAMIC_{PLATFORM}_{TYPE}_LIBRARIES vars.
  • Loading branch information...
commit 73cbd447174fd68a7048e37ccbf8ae2fa4351a93 1 parent d19c790
David I. Lehn davidlehn authored
10 cpp/app/Makefile.in
View
@@ -4,14 +4,10 @@ LIBRARIES = moapp
moapp_HEADERS = $(wildcard *.h)
moapp_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort mologging moio mocrypto monet modata moutil moconfig
+DYNAMIC_LINK_LIBRARIES = mort mologging moio mocrypto monet modata moutil moconfig
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += crypto ssl momodest mocompress
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += pthreadGCE2 mgwz libgnurx-0 libeay32 ssleay32 ws2_32
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = crypto ssl momodest mocompress
+DYNAMIC_WINDOWS_LINK_LIBRARIES = pthreadGCE2 mgwz libgnurx-0 libeay32 ssleay32 ws2_32
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/apps/monarch/Makefile.in
View
@@ -4,13 +4,9 @@ EXECUTABLES = monarch
DYNAMIC_LINK_LIBRARIES = mort momodest moutil moio mologging mocrypto monet mohttp modata moevent mofiber mosql mosqlite3 momail moconfig mocompress movalidation moapp moupnp mokernel
-ifeq (@BUILD_FOR_LINUX@,yes)
-DYNAMIC_LINK_LIBRARIES += pthread crypto ssl expat sqlite3
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += sqlite3
-DYNAMIC_EXECUTABLE_LIBRARIES += pthreadGCE2 libeay32 ssleay32 libexpat ws2_32
-endif
+DYNAMIC_LINUX_LINK_LIBRARIES = pthread crypto ssl expat sqlite3
+DYNAMIC_WINDOWS_LINK_LIBRARIES = sqlite3
+DYNAMIC_WINDOWS_EXECUTABLE_LIBRARIES = pthreadGCE2 libeay32 ssleay32 libexpat ws2_32
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
2  cpp/apps/portmap/Makefile.in
View
@@ -5,7 +5,7 @@ moportmap_HEADERS = $(wildcard *.h)
moportmap_SOURCES = $(wildcard *.cpp)
moportmap_MOD_DIR = apps
-DYNAMIC_LINK_LIBRARIES += mort moutil
+DYNAMIC_LINK_LIBRARIES = mort moutil
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
5 cpp/apps/tester/Makefile.in
View
@@ -9,10 +9,7 @@ HEADER_DIST_DIR = dist/include/monarch/apps/tester
DYNAMIC_LINK_LIBRARIES = mort modata moapp moconfig motest
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += \
- moio moutil mologging monet mocompress momodest mocrypto
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = moio moutil mologging monet mocompress momodest mocrypto
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/compress/Makefile.in
View
@@ -12,14 +12,10 @@ mocompress_SOURCES = \
$(wildcard gzip/*.cpp) \
$(wildcard zip/*.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moio moutil
+DYNAMIC_LINK_LIBRARIES = mort moio moutil
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += z
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += mgwz
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = z
+DYNAMIC_WINDOWS_LINK_LIBRARIES = mgwz
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
6 cpp/config/Makefile.in
View
@@ -4,11 +4,9 @@ LIBRARIES = moconfig
moconfig_HEADERS = $(wildcard *.h)
moconfig_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil moio modata mologging
+DYNAMIC_LINK_LIBRARIES = mort moutil moio modata mologging
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += mocompress monet momodest mocrypto
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = mocompress monet momodest mocrypto
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/crypto/Makefile.in
View
@@ -4,14 +4,10 @@ LIBRARIES = mocrypto
mocrypto_HEADERS = $(wildcard *.h)
mocrypto_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil moio
+DYNAMIC_LINK_LIBRARIES = mort moutil moio
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += crypto ssl
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += libeay32
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = crypto ssl
+DYNAMIC_WINDOWS_LINK_LIBRARIES = libeay32
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/data/Makefile.in
View
@@ -20,14 +20,10 @@ modata_SOURCES = \
$(wildcard riff/*.cpp) \
$(wildcard xml/*.cpp)
-DYNAMIC_LINK_LIBRARIES += moio moutil mort mologging monet
+DYNAMIC_LINK_LIBRARIES = moio moutil mort mologging monet
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += iconv charset expat mocompress momodest mocrypto
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += libexpat iconv2 charset1
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = iconv charset expat mocompress momodest mocrypto
+DYNAMIC_WINDOWS_LINK_LIBRARIES = libexpat iconv2 charset1
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
2  cpp/event/Makefile.in
View
@@ -4,7 +4,7 @@ LIBRARIES = moevent
moevent_HEADERS = $(wildcard *.h)
moevent_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil momodest
+DYNAMIC_LINK_LIBRARIES = mort moutil momodest
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/http/Makefile.in
View
@@ -4,14 +4,10 @@ LIBRARIES = mohttp
mohttp_HEADERS = $(wildcard *.h)
mohttp_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil momodest moio mocrypto mologging monet
+DYNAMIC_LINK_LIBRARIES = mort moutil momodest moio mocrypto mologging monet
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += crypto ssl
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += libeay32 ssleay32 ws2_32
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = crypto ssl
+DYNAMIC_WINDOWS_LINK_LIBRARIES = libeay32 ssleay32 ws2_32
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
2  cpp/io/Makefile.in
View
@@ -4,7 +4,7 @@ LIBRARIES = moio
moio_HEADERS = $(wildcard *.h)
moio_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil
+DYNAMIC_LINK_LIBRARIES = mort moutil
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/kernel/Makefile.in
View
@@ -4,14 +4,10 @@ LIBRARIES = mokernel
mokernel_HEADERS = $(wildcard *.h)
mokernel_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil momodest mofiber moconfig moio mocrypto moevent mologging monet modata movalidation
+DYNAMIC_LINK_LIBRARIES = mort moutil momodest mofiber moconfig moio mocrypto moevent mologging monet modata movalidation
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += crypto ssl mocompress
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += libeay32 ssleay32
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = crypto ssl mocompress
+DYNAMIC_WINDOWS_LINK_LIBRARIES = libeay32 ssleay32
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
2  cpp/logging/Makefile.in
View
@@ -4,7 +4,7 @@ LIBRARIES = mologging
mologging_HEADERS = $(wildcard *.h)
mologging_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil moio mocompress
+DYNAMIC_LINK_LIBRARIES = mort moutil moio mocompress
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
6 cpp/mail/Makefile.in
View
@@ -4,11 +4,9 @@ LIBRARIES = momail
momail_HEADERS = $(wildcard *.h)
momail_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moio monet moutil modata mosql mosqlite3
+DYNAMIC_LINK_LIBRARIES = mort moio monet moutil modata mosql mosqlite3
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += mologging momodest mocrypto mocompress movalidation
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = mologging momodest mocrypto mocompress movalidation
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
2  cpp/modest/Makefile.in
View
@@ -4,7 +4,7 @@ LIBRARIES = momodest
momodest_HEADERS = $(wildcard *.h)
momodest_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort
+DYNAMIC_LINK_LIBRARIES = mort
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/mysql/Makefile.in
View
@@ -5,15 +5,11 @@ LIBRARIES = momysql
momysql_HEADERS = $(wildcard *.h)
momysql_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort monet mosql mysqlclient
+DYNAMIC_LINK_LIBRARIES = mort monet mosql mysqlclient
HEADER_DIST_DIR = dist/include/monarch/sql/mysql
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += mysql
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += mysqlclient moutil momodest moio mocrypto mologging mocompress modata movalidation
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = mysql
+DYNAMIC_WINDOWS_LINK_LIBRARIES += mysqlclient moutil momodest moio mocrypto mologging mocompress modata movalidation
endif
10 cpp/net/Makefile.in
View
@@ -4,14 +4,10 @@ LIBRARIES = monet
monet_HEADERS = $(wildcard *.h)
monet_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil momodest moio mocrypto mologging
+DYNAMIC_LINK_LIBRARIES = mort moutil momodest moio mocrypto mologging
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += crypto ssl mocompress
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += libeay32 ssleay32 ws2_32
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = crypto ssl mocompress
+DYNAMIC_WINDOWS_LINK_LIBRARIES = libeay32 ssleay32 ws2_32
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
4 cpp/rt/Makefile.in
View
@@ -4,9 +4,7 @@ LIBRARIES = mort
mort_HEADERS = $(wildcard *.h)
mort_SOURCES = $(wildcard *.cpp)
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += pthreadGCE2
-endif
+DYNAMIC_WINDOWS_LINK_LIBRARIES = pthreadGCE2
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
6 cpp/sphinx/Makefile.in
View
@@ -5,11 +5,9 @@ LIBRARIES = mosphinx
mosphinx_HEADERS = $(wildcard *.h)
mosphinx_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil mocrypto moio monet
+DYNAMIC_LINK_LIBRARIES = mort moutil mocrypto moio monet
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += momodest mologging mocompress
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = momodest mologging mocompress
endif
6 cpp/sql/Makefile.in
View
@@ -4,11 +4,9 @@ LIBRARIES = mosql
mosql_HEADERS = $(wildcard *.h)
mosql_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil monet mologging modata movalidation
+DYNAMIC_LINK_LIBRARIES = mort moutil monet mologging modata movalidation
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += moio momodest mocrypto mocompress
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = moio momodest mocrypto mocompress
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
10 cpp/sqlite3/Makefile.in
View
@@ -4,15 +4,11 @@ LIBRARIES = mosqlite3
mosqlite3_HEADERS = $(wildcard *.h)
mosqlite3_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort momodest moutil moio mocrypto monet mosql
+DYNAMIC_LINK_LIBRARIES = mort momodest moutil moio mocrypto monet mosql
HEADER_DIST_DIR = dist/include/monarch/sql/sqlite3
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += sqlite3 mologging mocompress modata movalidation
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += sqlite3
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = sqlite3 mologging mocompress modata movalidation
+DYNAMIC_WINDOWS_LINK_LIBRARIES = sqlite3
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
7 cpp/test/Makefile.in
View
@@ -4,12 +4,9 @@ LIBRARIES = motest
motest_HEADERS = $(wildcard *.h)
motest_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort modata moapp moconfig
+DYNAMIC_LINK_LIBRARIES = mort modata moapp moconfig
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += \
- moio moutil mologging monet mocompress momodest mocrypto
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = moio moutil mologging monet mocompress momodest mocrypto
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
14 cpp/tests/Makefile.in
View
@@ -76,16 +76,10 @@ $(foreach mod,$(TEST_MODS),$(eval $(call setup_test_mod,$(mod))))
DYNAMIC_LINK_LIBRARIES = mort momodest moutil mofiber moio mologging mocrypto monet mohttp modata mosql mosqlite3 $(MYSQL_LIBS) moevent momail moconfig mocompress movalidation moupnp $(SPHINX_LIBS) moapp mokernel motest
DYNAMIC_EXECUTABLE_LIBRARIES = motest
-ifeq (@BUILD_FOR_LINUX@,yes)
-DYNAMIC_LINK_LIBRARIES += pthread crypto ssl expat sqlite3 $(MYSQL_DYNAMIC_LIBRARIES)
-endif
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += sqlite3 $(MYSQL_DYNAMIC_LIBRARIES)
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += sqlite3 $(MYSQL_DYNAMIC_LIBRARIES)
-DYNAMIC_EXECUTABLE_LIBRARIES += pthreadGCE2 libeay32 ssleay32 libexpat sqlite3 iconv2 charset1 $(MYSQL_EXECUTABLE_LIBRARIES) ws2_32 motest
-endif
+DYNAMIC_LINUX_LINK_LIBRARIES = pthread crypto ssl expat sqlite3 $(MYSQL_DYNAMIC_LIBRARIES)
+DYNAMIC_MACOS_LINK_LIBRARIES = sqlite3 $(MYSQL_DYNAMIC_LIBRARIES)
+DYNAMIC_WINDOWS_LINK_LIBRARIES = sqlite3 $(MYSQL_DYNAMIC_LIBRARIES)
+DYNAMIC_WINDOWS_EXECUTABLE_LIBRARIES = pthreadGCE2 libeay32 ssleay32 libexpat sqlite3 iconv2 charset1 $(MYSQL_EXECUTABLE_LIBRARIES) ws2_32 motest
# conditional build of tests
endif
10 cpp/upnp/Makefile.in
View
@@ -4,14 +4,10 @@ LIBRARIES = moupnp
moupnp_HEADERS = $(wildcard *.h)
moupnp_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil momodest moio mocrypto monet mohttp mologging modata
+DYNAMIC_LINK_LIBRARIES = mort moutil momodest moio mocrypto monet mohttp mologging modata
-ifeq (@BUILD_FOR_MACOS@,yes)
-DYNAMIC_LINK_LIBRARIES += mocompress
-endif
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += libgnurx-0
-endif
+DYNAMIC_MACOS_LINK_LIBRARIES = mocompress
+DYNAMIC_WINDOWS_LINK_LIBRARIES = libgnurx-0
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
6 cpp/util/Makefile.in
View
@@ -8,11 +8,9 @@ moutil_SOURCES = \
$(wildcard *.cpp) \
$(wildcard regex/*.cpp)
-DYNAMIC_LINK_LIBRARIES += mort
+DYNAMIC_LINK_LIBRARIES = mort
-ifeq (@BUILD_FOR_WINDOWS@,yes)
-DYNAMIC_LINK_LIBRARIES += libgnurx-0
-endif
+DYNAMIC_WINDOWS_LINK_LIBRARIES = libgnurx-0
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
2  cpp/validation/Makefile.in
View
@@ -4,7 +4,7 @@ LIBRARIES = movalidation
movalidation_HEADERS = $(wildcard *.h)
movalidation_SOURCES = $(wildcard *.cpp)
-DYNAMIC_LINK_LIBRARIES += mort moutil
+DYNAMIC_LINK_LIBRARIES = mort moutil
# ----------- Standard Makefile
include @MONARCH_DIR@/setup/Makefile.base
6 setup/Makefile.base.in
View
@@ -52,6 +52,8 @@ STATIC_LIB_EXT=a
EXECUTABLE_EXT=
MO_CXX_FLAGS += -march=i686 -fPIC -DLINUX $(MODULE_CXX_FLAGS) $(MODULE_LINUX_CXX_FLAGS)
MO_LIBS += -L/usr/lib/mysql
+DYNAMIC_LINK_LIBRARIES += $(DYNAMIC_LINUX_LINK_LIBRARIES)
+DYNAMIC_EXECUTABLE_LIBRARIES += $(DYNAMIC_LINUX_EXECUTABLE_LIBRARIES)
endif
ifeq ($(BUILD_FOR_MACOS),yes)
@@ -69,6 +71,8 @@ MO_LIB_LD_FLAGS += \
# Add default location for Fink
MO_INCLUDES += -I/sw/include
MO_LIBS += -L/sw/lib
+DYNAMIC_LINK_LIBRARIES += $(DYNAMIC_MACOS_LINK_LIBRARIES)
+DYNAMIC_EXECUTABLE_LIBRARIES += $(DYNAMIC_MACOS_EXECUTABLE_LIBRARIES)
endif
ifeq ($(BUILD_FOR_WINDOWS),yes)
@@ -88,6 +92,8 @@ MO_INCLUDES += \
-I$(TOP_SRC_DIR)/cpp/3rdparty/sqlite3/include \
-I$(TOP_SRC_DIR)/cpp/3rdparty/zlib/include \
-I$(TOP_SRC_DIR)/cpp/3rdparty/iconv/include
+DYNAMIC_LINK_LIBRARIES += $(DYNAMIC_WINDOWS_LINK_LIBRARIES)
+DYNAMIC_EXECUTABLE_LIBRARIES += $(DYNAMIC_WINDOWS_EXECUTABLE_LIBRARIES)
endif
# Platform-agnostic build rules
Please sign in to comment.
Something went wrong with that request. Please try again.