Changeset 8b863a62 in mainline for uspace/app/vterm/Makefile


Ignore:
Timestamp:
2014-04-16T17:14:06Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f857e8b
Parents:
dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/vterm/Makefile

    rdba3e2c r8b863a62  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBGUI_PREFIX)/libgui.a $(LIBDRAW_PREFIX)/libdraw.a \
    31         $(LIBSOFTREND_PREFIX)/libsoftrend.a $(LIBGRAPH_PREFIX)/libgraph.a \
     30
     31LIBS = \
     32        $(LIBGUI_PREFIX)/libgui.a \
     33        $(LIBDRAW_PREFIX)/libdraw.a \
     34        $(LIBSOFTREND_PREFIX)/libsoftrend.a \
     35        $(LIBGRAPH_PREFIX)/libgraph.a \
    3236        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    33 EXTRA_CFLAGS += -I$(LIBGUI_PREFIX) -I$(LIBDRAW_PREFIX) \
    34         -I$(LIBSOFTREND_PREFIX) -I$(LIBGRAPH_PREFIX)
     37
     38EXTRA_CFLAGS += \
     39        -I$(LIBGUI_PREFIX) \
     40        -I$(LIBDRAW_PREFIX) \
     41        -I$(LIBSOFTREND_PREFIX) \
     42        -I$(LIBGRAPH_PREFIX)
     43
    3544BINARY = vterm
     45MATH = y
    3646
    3747SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.