diff options
| author | Anders Svensson <[email protected]> | 2011-09-27 20:26:47 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-09-27 20:26:47 +0200 |
| commit | d897eea38983f0adfa0e8a2dc483879bc1126f94 (patch) | |
| tree | 6b17d52c4e9dc2d6215363302c346bd8c6512e6d /lib/diameter/src/compiler | |
| parent | 571bc8c6135cb902e7cf9429f1bfad67284f8f23 (diff) | |
| parent | 58fe7b5e48ad95f14b05aae43a3a32122695da4e (diff) | |
| download | otp-d897eea38983f0adfa0e8a2dc483879bc1126f94.tar.gz otp-d897eea38983f0adfa0e8a2dc483879bc1126f94.tar.bz2 otp-d897eea38983f0adfa0e8a2dc483879bc1126f94.zip | |
Merge branch 'dev' into major
Conflicts:
lib/diameter/src/app/Makefile
Diffstat (limited to 'lib/diameter/src/compiler')
| -rw-r--r-- | lib/diameter/src/compiler/Makefile | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/diameter/src/compiler/Makefile b/lib/diameter/src/compiler/Makefile index 3ab76064ac..779013bfbc 100644 --- a/lib/diameter/src/compiler/Makefile +++ b/lib/diameter/src/compiler/Makefile @@ -94,16 +94,6 @@ info: @echo "" # ---------------------------------------------------- -# Special Build Targets -# ---------------------------------------------------- - -# Invoked from ../app to add modules to the app file. -$(APP_TARGET): force - M=`echo $(MODULES) | sed -e 's/^ *//' -e 's/ *$$//' -e 'y/ /,/'`; \ - echo "/%COMPILER_MODULES%/s//$$M/;w;q" | tr ';' '\n' \ - | ed -s $@ - -# ---------------------------------------------------- # Release Target # ---------------------------------------------------- ifneq ($(ERL_TOP),) |