diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-07-17 18:18:07 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-07-19 20:22:56 +0200 |
| commit | c05db88a9ab69bd25cae378210b1b1b35dbd68c6 (patch) | |
| tree | bca516f39a7da6c0fb1b01bb94fb2c13798a73f2 | |
| parent | 5bf65f443dec24eec44264cd7ece17025721383a (diff) | |
| download | otp-c05db88a9ab69bd25cae378210b1b1b35dbd68c6.tar.gz otp-c05db88a9ab69bd25cae378210b1b1b35dbd68c6.tar.bz2 otp-c05db88a9ab69bd25cae378210b1b1b35dbd68c6.zip | |
megaco: Remove VxWorks
| -rw-r--r-- | lib/megaco/configure.in | 2 | ||||
| -rw-r--r-- | lib/megaco/src/flex/Makefile.in | 9 | ||||
| -rw-r--r-- | lib/megaco/src/rules.mk | 4 | ||||
| -rw-r--r-- | lib/megaco/test/megaco.spec.vxworks | 5 |
4 files changed, 1 insertions, 19 deletions
diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in index 42c50b8961..722ccc3fb4 100644 --- a/lib/megaco/configure.in +++ b/lib/megaco/configure.in @@ -145,7 +145,7 @@ AC_ARG_ENABLE(megaco_flex_scanner_lineno, AC_SUBST(ENABLE_MEGACO_FLEX_SCANNER_LINENO) -dnl This is the os flavour, should be unix, vxworks or win32 +dnl This is the os flavour, should be unix or win32 if test "X$host" = "Xwin32"; then ERLANG_OSTYPE=win32 else diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in index 976ecaa4f7..cb1d7d2a5c 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -104,10 +104,6 @@ ENABLE_MEGACO_FLEX_SCANNER_LINENO = @ENABLE_MEGACO_FLEX_SCANNER_LINENO@ endif endif -ifeq ($(findstring vxworks,$(TARGET)),vxworks) - DED_INCLUDES += -I$(ERL_TOP)/erts/etc/vxworks -endif - PRIVDIR = ../../priv LIBDIR = $(PRIVDIR)/lib/$(TARGET) OBJDIR = $(PRIVDIR)/obj/$(TARGET) @@ -146,15 +142,10 @@ ifeq ($(findstring win32,$(TARGET)), win32) FLEX_SCANNER_SO = SOLIBS = $(FLEX_SCANNER_SO) else -ifeq ($(findstring vxworks,$(TARGET)),vxworks) -FLEX_SCANNER_SO = -SOLIBS = $(FLEX_SCANNER_SO) -else FLEX_SCANNER_SO = $(LIBDIR)/$(STD_DRV).$(DED_EXT) FLEX_SCANNER_MT_SO = $(LIBDIR)/$(MT_DRV).$(DED_EXT) SOLIBS = $(FLEX_SCANNER_SO) $(FLEX_SCANNER_MT_SO) endif -endif # ---------------------------------------------------- diff --git a/lib/megaco/src/rules.mk b/lib/megaco/src/rules.mk index 20fbed2a76..a59060032d 100644 --- a/lib/megaco/src/rules.mk +++ b/lib/megaco/src/rules.mk @@ -29,10 +29,6 @@ PERL = perl # Erlang language section # ---------------------------------------------------- EMULATOR = beam -ifeq ($(findstring vxworks,$(TARGET)),vxworks) -# VxWorks jam object files should be compressed -ERL_COMPILE_FLAGS += +compressed -endif ERLC_WFLAGS = -W ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS) ERL.beam = erl.beam -boot start_clean diff --git a/lib/megaco/test/megaco.spec.vxworks b/lib/megaco/test/megaco.spec.vxworks deleted file mode 100644 index 2ac250e443..0000000000 --- a/lib/megaco/test/megaco.spec.vxworks +++ /dev/null @@ -1,5 +0,0 @@ -{topcase, {dir, "../megaco_test"}}. -{require_nodenames, 1}. -{skip, {megaco_digit_map_test, all, "Not yet implemented"}}. -{skip, {megaco_measure_test, all, "Not yet implemented"}}. -%{skip, {M, F, "Not yet implemented"}}. |