diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-19 15:11:16 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-19 15:11:16 +0200 |
| commit | 70fa7fabed2fb4f47155f02a1c8fa4054a546739 (patch) | |
| tree | 7d755f622e3568f78fad2da4409725d3a13f11b8 /lib/orber/include/Makefile | |
| parent | bdc4bab74e7ea605d38f1d0b7dca4b92ec4c7f1d (diff) | |
| parent | 692772c8e238d66eb054faba5dd0fba4bacf3a2f (diff) | |
| download | otp-70fa7fabed2fb4f47155f02a1c8fa4054a546739.tar.gz otp-70fa7fabed2fb4f47155f02a1c8fa4054a546739.tar.bz2 otp-70fa7fabed2fb4f47155f02a1c8fa4054a546739.zip | |
Merge branch 'dev' into major
* dev:
tar_SUITE: Work around limited pathname length on Windows
Merge the fourth bootstrap stage into the third bootstrap stage
Remove unused lib/orber/include/Makefile
Remove lib/orber/include/* from the primary bootstrap
otp_build update_primary: Don't commit generated source files
primary bootstrap: Remove source files
Conflicts:
Makefile.in
bootstrap/bin/start.script
bootstrap/bin/start_clean.script
bootstrap/lib/compiler/ebin/compiler.app
bootstrap/lib/compiler/egen/beam_opcodes.erl
bootstrap/lib/compiler/egen/core_parse.erl
bootstrap/lib/kernel/ebin/kernel.app
bootstrap/lib/kernel/ebin/kernel.appup
bootstrap/lib/orber/include/Makefile
bootstrap/lib/orber/include/corba.hrl
bootstrap/lib/orber/include/orber_pi.hrl
bootstrap/lib/stdlib/ebin/stdlib.app
bootstrap/lib/stdlib/ebin/stdlib.appup
bootstrap/lib/stdlib/egen/erl_parse.erl
Diffstat (limited to 'lib/orber/include/Makefile')
| -rw-r--r-- | lib/orber/include/Makefile | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/lib/orber/include/Makefile b/lib/orber/include/Makefile deleted file mode 100644 index 219b7085e6..0000000000 --- a/lib/orber/include/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# %CopyrightBegin% -# -# Copyright Ericsson AB 1998-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% -# -# -include $(ERL_TOP)/make/target.mk - -include $(ERL_TOP)/make/$(TARGET)/otp.mk - -# ---------------------------------------------------- -# Application version -# ---------------------------------------------------- -include ../vsn.mk -VSN=$(ORBER_VSN) - -# ---------------------------------------------------- -# Release directory specification -# ---------------------------------------------------- -RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN) - -# ---------------------------------------------------- -# Target Specs -# ---------------------------------------------------- - -EXTERNAL_HRL_FILES= ../include/corba.hrl \ - ../include/ifr_types.hrl \ - ../include/orber_pi.hrl - -# ---------------------------------------------------- -# FLAGS -# ---------------------------------------------------- - -# ---------------------------------------------------- -# Targets -# ---------------------------------------------------- -debug opt clean docs: - - -# ---------------------------------------------------- -# Release Target -# ---------------------------------------------------- -include $(ERL_TOP)/make/otp_release_targets.mk - - -release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/include - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include - - -release_docs_spec: - - |