aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/zlib/Makefile
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2012-01-11 10:13:17 +0100
committerRaimo Niskanen <[email protected]>2012-01-13 12:04:41 +0100
commit5bdfce65ad97251e25b09d94231f5a7386a3c4e3 (patch)
tree1aec8a38455843250ea35b367ee6f785a502a9b7 /erts/emulator/zlib/Makefile
parenta67091debf20c972dd7ce1a8379fee6673fbe571 (diff)
downloadotp-5bdfce65ad97251e25b09d94231f5a7386a3c4e3.tar.gz
otp-5bdfce65ad97251e25b09d94231f5a7386a3c4e3.tar.bz2
otp-5bdfce65ad97251e25b09d94231f5a7386a3c4e3.zip
erts: Fix parallel make for emulator zlib
Convert the recursive make for zlib into a make include file.
Diffstat (limited to 'erts/emulator/zlib/Makefile')
-rw-r--r--erts/emulator/zlib/Makefile23
1 files changed, 0 insertions, 23 deletions
diff --git a/erts/emulator/zlib/Makefile b/erts/emulator/zlib/Makefile
deleted file mode 100644
index def8e1aa47..0000000000
--- a/erts/emulator/zlib/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
-#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-#
-# %CopyrightEnd%
-#
-#
-# Invoke with GNU make or clearmake -C gnu.
-#
-
-include $(ERL_TOP)/make/run_make.mk