diff options
-rw-r--r-- | core/deps.mk | 2 | ||||
-rw-r--r-- | erlang.mk | 6 | ||||
-rw-r--r-- | packages.v1.tsv | 1 | ||||
-rw-r--r-- | packages.v1.txt | 1 | ||||
-rw-r--r-- | packages.v2.tsv | 1 | ||||
-rw-r--r-- | plugins/c_src.mk | 16 | ||||
-rw-r--r-- | plugins/dialyzer.mk | 2 |
7 files changed, 23 insertions, 6 deletions
diff --git a/core/deps.mk b/core/deps.mk index 9491b3f..2ddf5d4 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -31,7 +31,7 @@ PKG_FILE_URL ?= https://raw.githubusercontent.com/extend/erlang.mk/master/packag deps:: $(ALL_DEPS_DIRS) @for dep in $(ALL_DEPS_DIRS) ; do \ - if [ -f $$dep/Makefile ] ; then \ + if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \ $(MAKE) -C $$dep ; \ else \ echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep ; \ @@ -183,7 +183,7 @@ $(foreach dep,$(DEPS),$(eval $(call dep_target,$(dep)))) deps: $(ALL_DEPS_DIRS) @for dep in $(ALL_DEPS_DIRS) ; do \ - if [ -f $$dep/Makefile ] ; then \ + if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \ $(MAKE) -C $$dep ; \ else \ echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep ; \ @@ -192,7 +192,7 @@ deps: $(ALL_DEPS_DIRS) clean-deps: @for dep in $(ALL_DEPS_DIRS) ; do \ - if [ -f $$dep/Makefile ] ; then \ + if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \ $(MAKE) -C $$dep clean ; \ else \ echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep clean ; \ @@ -269,7 +269,7 @@ build-plt: deps app @dialyzer --build_plt --apps erts kernel stdlib $(PLT_APPS) $(ALL_DEPS_DIRS) dialyze: - @dialyzer --src src --no_native $(DIALYZER_OPTS) + @dialyzer --no_native --src src $(DIALYZER_OPTS) # Packages. diff --git a/packages.v1.tsv b/packages.v1.tsv index 40de701..02a1a39 100644 --- a/packages.v1.tsv +++ b/packages.v1.tsv @@ -2,6 +2,7 @@ bullet https://github.com/extend/bullet http://ninenines.eu Simple, reliable, ef cowboy https://github.com/extend/cowboy http://ninenines.eu Small, fast and modular HTTP server. cowlib https://github.com/extend/cowlib http://ninenines.eu Support library for manipulating Web protocols. erlydtl https://github.com/erlydtl/erlydtl https://github.com/erlydtl/erlydtl Django Template Language for Erlang. +eper https://github.com/massemanet/eper https://github.com/massemanet/eper Erlang Performance and debugging tools. farwest_core https://github.com/extend/farwest_core http//ninenines.eu Modern web application development platform. farwest_ui https://github.com/extend/farwest_ui http://ninenines.eu Development and administration UI for Farwest. gun https://github.com/extend/gun http//ninenines.eu Asynchronous SPDY, HTTP and Websocket client written in Erlang. diff --git a/packages.v1.txt b/packages.v1.txt index 40de701..02a1a39 100644 --- a/packages.v1.txt +++ b/packages.v1.txt @@ -2,6 +2,7 @@ bullet https://github.com/extend/bullet http://ninenines.eu Simple, reliable, ef cowboy https://github.com/extend/cowboy http://ninenines.eu Small, fast and modular HTTP server. cowlib https://github.com/extend/cowlib http://ninenines.eu Support library for manipulating Web protocols. erlydtl https://github.com/erlydtl/erlydtl https://github.com/erlydtl/erlydtl Django Template Language for Erlang. +eper https://github.com/massemanet/eper https://github.com/massemanet/eper Erlang Performance and debugging tools. farwest_core https://github.com/extend/farwest_core http//ninenines.eu Modern web application development platform. farwest_ui https://github.com/extend/farwest_ui http://ninenines.eu Development and administration UI for Farwest. gun https://github.com/extend/gun http//ninenines.eu Asynchronous SPDY, HTTP and Websocket client written in Erlang. diff --git a/packages.v2.tsv b/packages.v2.tsv index 295fad2..0977180 100644 --- a/packages.v2.tsv +++ b/packages.v2.tsv @@ -1,6 +1,7 @@ bullet git https://github.com/extend/bullet master http://ninenines.eu Simple, reliable, efficient streaming for Cowboy. cowboy git https://github.com/extend/cowboy master http://ninenines.eu Small, fast and modular HTTP server. cowlib git https://github.com/extend/cowlib master http://ninenines.eu Support library for manipulating Web protocols. +eper git https://github.com/massemanet/eper master https://github.com/massemanet/eper Erlang performance and debugging tools. erlydtl git https://github.com/erlydtl/erlydtl master https://github.com/erlydtl/erlydtl Django Template Language for Erlang. gun git https://github.com/extend/gun master http//ninenines.eu Asynchronous SPDY, HTTP and Websocket client written in Erlang. jsx git https://github.com/talentdeficit/jsx master https://github.com/talentdeficit/jsx An Erlang application for consuming, producing and manipulating JSON. diff --git a/plugins/c_src.mk b/plugins/c_src.mk index e1d8297..63ca6bc 100644 --- a/plugins/c_src.mk +++ b/plugins/c_src.mk @@ -11,6 +11,20 @@ C_SRC_ENV ?= $(C_SRC_DIR)/env.mk C_SRC_OPTS ?= C_SRC_OUTPUT ?= $(CURDIR)/priv/$(PROJECT).so +# System type and C compiler/flags. + +UNAME_SYS := $(shell uname -s) +ifeq ($(UNAME_SYS), Darwin) + CC ?= cc + CFLAGS ?= -O3 -std=c99 -arch x86_64 -flat_namespace -undefined suppress -finline-functions -Wall -Wmissing-prototypes +else ifeq ($(UNAME_SYS), FreeBSD) + CC ?= cc + CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes +else ifeq ($(UNAME_SYS), Linux) + CC ?= gcc + CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes +endif + # Verbosity. c_src_verbose_0 = @echo " C_SRC " $(?F); @@ -22,7 +36,7 @@ ifeq ($(wildcard $(C_SRC_DIR)/Makefile),) app:: $(C_SRC_ENV) @mkdir -p priv/ - $(c_src_verbose) gcc $(C_SRC_DIR)/*.c -fPIC -shared -o $(C_SRC_OUTPUT) \ + $(c_src_verbose) $(CC) $(CFLAGS) $(C_SRC_DIR)/*.c -fPIC -shared -o $(C_SRC_OUTPUT) \ -I $(ERTS_INCLUDE_DIR) $(C_SRC_OPTS) $(C_SRC_ENV): diff --git a/plugins/dialyzer.mk b/plugins/dialyzer.mk index 8754919..daec129 100644 --- a/plugins/dialyzer.mk +++ b/plugins/dialyzer.mk @@ -31,4 +31,4 @@ distclean-plt: $(gen_verbose) rm -f $(DIALYZER_PLT) dialyze: - @dialyzer --src src --no_native $(DIALYZER_OPTS) + @dialyzer --no_native --src src $(DIALYZER_OPTS) |