Changeset 681a985 in mainline


Ignore:
Timestamp:
2012-08-17T04:30:42Z (12 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3a7356dc
Parents:
b224a3e
Message:

Bithenge: move library to uspace/lib

Location:
uspace
Files:
3 added
4 edited
24 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    rb224a3e r681a985  
    206206        lib/usbhid \
    207207        lib/usbvirt \
     208        lib/bithenge \
    208209        lib/posix
    209210

  • uspace/Makefile.common

    rb224a3e r681a985  
    130130LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
    131131
     132LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
     133
    132134ifeq ($(STATIC_NEEDED),y)
    133135        STATIC_BUILD = y

  • uspace/app/bithenge/Makefile

    rb224a3e r681a985  
    2828
    2929USPACE_PREFIX = ../..
    30 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    31 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -D__HELENOS__ -Ihelenos
     30LIBS = $(LIBBITHENGE_PREFIX)/libbithenge.a $(LIBBLOCK_PREFIX)/libblock.a
     31EXTRA_CFLAGS = -I$(LIBBITHENGE_PREFIX) -D__HELENOS__
    3232BINARY = bithenge
    3333
    3434SOURCES = \
    35         helenos/block.c \
    36         blob.c \
    37         compound.c \
    38         expression.c \
    39         file.c \
    40         print.c \
    41         script.c \
    42         sequence.c \
    43         source.c \
    44         test.c \
    45         transform.c \
    46         tree.c
     35        test.c
    4736
    4837include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/bithenge/Makefile.linux

    rb224a3e r681a985  
    2929CFLAGS += -fexec-charset=UTF-8 -finput-charset=UTF-8 -std=gnu99 -pipe
    3030CFLAGS += -Wall -Wextra -Werror -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes -Werror-implicit-function-declaration -Wwrite-strings
     31CFLAGS += -ftrapv
    3132CFLAGS += -g
    32 CFLAGS += -Ilinux
     33
     34LIBBITHENGE_PREFIX = ../../lib/bithenge
     35CFLAGS += -I$(LIBBITHENGE_PREFIX)
     36LIBS += $(LIBBITHENGE_PREFIX)/libbithenge.a
    3337
    3438BINARY = bithenge
    3539
    3640SOURCES = \
    37         blob.c \
    38         compound.c \
    39         expression.c \
    40         file.c \
    41         print.c \
    42         script.c \
    43         sequence.c \
    44         source.c \
    45         test.c \
    46         transform.c \
    47         tree.c
     41        test.c
    4842
    4943OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    5044
    5145$(BINARY): $(OBJECTS)
    52         $(CC) $(CFLAGS) -o $@ $^
     46        $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
    5347
    5448clean:

  • uspace/lib/bithenge/expression.h

    rb224a3e r681a985  
    7373                return;
    7474        assert(self->ops);
     75        assert(self->refs > 0);
    7576        if (--self->refs == 0)
    7677                self->ops->destroy(self);

  • uspace/lib/bithenge/transform.h

    rb224a3e r681a985  
    110110                return;
    111111        assert(self->ops);
     112        assert(self->refs > 0);
    112113        if (--self->refs == 0)
    113114                self->ops->destroy(self);

  • uspace/lib/bithenge/tree.c

    rb224a3e r681a985  
    7676        if (!node)
    7777                return;
     78        assert (node->refs > 0);
    7879        if (--node->refs == 0)
    7980                node_destroy(node);
Note: See TracChangeset for help on using the changeset viewer.