Permalink
Browse files

Merge branch 'maint'

  • Loading branch information...
bufflig committed Feb 28, 2012
2 parents def4100 + cc3122a commit d3a96b096f457c881296c4e7f69de47399ab9ed8
View
@@ -157,6 +157,14 @@ ERLANG_LIBDIR = $(DESTDIR)$(ERLANG_INST_LIBDIR)
# Must be GNU make!
MAKE = @MAKE_PROG@
NATIVE_LIBS_ENABLED = @NATIVE_LIBS_ENABLED@
ifeq ($(NATIVE_LIBS_ENABLED),yes)
HIPE_BOOTSTRAP_EBIN = boot_ebin
else
HIPE_BOOTSTRAP_EBIN = ebin
endif
# This should be set to the target "arch-vendor-os"
TARGET := @TARGET@
include $(ERL_TOP)/make/target.mk
@@ -527,7 +535,7 @@ secondary_bootstrap_build:
secondary_bootstrap_copy:
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin ; fi
for x in lib/hipe/ebin/*.beam; do \
for x in lib/hipe/$(HIPE_BOOTSTRAP_EBIN)/*.beam; do \
BN=`basename $$x`; \
TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin/$$BN; \
test -f $$TF && \
@@ -537,7 +545,6 @@ secondary_bootstrap_copy:
cp $$x $$TF; \
true; \
done
# if test -f lib/hipe/ebin/hipe.beam ; then cp lib/hipe/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/hipe/ebin; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/ebin ; fi
if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/parsetools/include ; fi
View
@@ -361,6 +361,12 @@ if test X${enable_m32_build} = Xyes; then
export LDFLAGS
fi
NATIVE_LIBS_ENABLED=
if test X${enable_native_libs} = Xyes -a X${enable_hipe} != Xno; then
NATIVE_LIBS_ENABLED=yes
fi
AC_SUBST(NATIVE_LIBS_ENABLED)
export ERL_TOP
AC_CONFIG_SUBDIRS(lib erts)
View
@@ -37,8 +37,13 @@ else
SUB_DIRECTORIES = $(ALWAYS_SUBDIRS)
endif
include native.mk
ifndef EBIN
EBIN = ../ebin
endif
#
# Default Subdir Targets
#
@@ -52,12 +57,20 @@ edocs:
fi
all-subdirs:
-for dir in $(SUB_DIRECTORIES); do \
(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=../ebin; cd ..); \
for dir in $(SUB_DIRECTORIES); do \
(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=$(EBIN); cd ..); \
done
# distclean and realclean should clean the bootstrap files
all-subdirs-x:
for dir in $(SUB_DIRECTORIES); do \
(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=../boot_ebin; cd ..); \
done
clean:
$(MAKE) MAKETARGET="clean" all-subdirs all-subdirs-x
distclean:
$(MAKE) MAKETARGET="distclean" all-subdirs
$(MAKE) MAKETARGET="distclean" all-subdirs all-subdirs-x
realclean:
$(MAKE) MAKETARGET="realclean" all-subdirs
$(MAKE) MAKETARGET="realclean" all-subdirs all-subdirs-x
View
@@ -89,6 +89,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -90,6 +90,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
No changes.
View
@@ -82,6 +82,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -24,6 +24,9 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
clean:
-rm -f *.html edoc-info stylesheet.css erlang.png
distclean: clean
realclean: clean
# ----------------------------------------------------
# Special Build Targets
# ----------------------------------------------------
@@ -97,6 +97,9 @@ clean clean_docs:
rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
rm -f errs core *~
distclean: clean
realclean: clean
# ----------------------------------------------------
# Release Target
# ----------------------------------------------------
View
@@ -82,6 +82,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -100,6 +100,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -93,6 +93,9 @@ clean:
rm -f $(TARGET_FILES) $(DOC_FILES) $(HRL_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -1,5 +1,7 @@
ifndef SECONDARY_BOOTSTRAP
ifeq ($(NATIVE_LIBS_ENABLED),yes)
ifndef SECONDARY_BOOTSTRAP
ERL_COMPILE_FLAGS += +native
else
EBIN = ../boot_ebin
endif
endif
View
@@ -80,6 +80,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -92,6 +92,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
@@ -94,6 +94,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -89,6 +89,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core erl_crash.dump
distclean: clean
realclean: clean
# ----------------------------------------------------
# Special Build Targets
# ----------------------------------------------------
View
@@ -92,6 +92,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -85,6 +85,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -100,6 +100,9 @@ clean:
rm -f $(TARGET_FILES)
rm -f core
distclean: clean
realclean: clean
$(DOCS)/%.html:%.erl
erl -noshell -run edoc_run file '"$<"' '[{dir, "$(DOCS)"}]' -s init stop
View
@@ -115,6 +115,12 @@ $(EBIN)/%.beam: $(EGEN)/%.erl
$(EBIN)/%.beam: $(ESRC)/%.erl
$(ERLC) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
ifeq ($(NATIVE_LIBS_ENABLED),yes)
# Special rule for the HIPE bootstrap w/ native libs
../boot_ebin/%.beam: $(ESRC)/%.erl
$(ERLC) $(ERL_COMPILE_FLAGS) -o../boot_ebin $<
endif
.erl.beam:
$(ERLC) $(ERL_COMPILE_FLAGS) -o$(dir $@) $<

0 comments on commit d3a96b0

Please sign in to comment.