Changeset f63a591d in mainline


Ignore:
Timestamp:
2010-10-14T22:06:53Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c89eefb, ef689ef0
Parents:
514ee46
Message:

Rename what remained of libsocket to libpacket.

Location:
uspace
Files:
20 edited
4 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r514ee46 rf63a591d  
    134134        lib/softint \
    135135        lib/softfloat \
    136         lib/socket \
     136        lib/packet \
    137137        lib/net
    138138

  • uspace/Makefile.common

    r514ee46 rf63a591d  
    8888LIBPCI_PREFIX = $(LIB_PREFIX)/pci
    8989
    90 LIBSOCKET_PREFIX = $(LIB_PREFIX)/socket
     90LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
    9191LIBNET_PREFIX = $(LIB_PREFIX)/net
    9292

  • uspace/app/netecho/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = netecho
    3434

  • uspace/app/nettest1/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = nettest1
    3434

  • uspace/app/nettest2/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = nettest2
    3434

  • uspace/app/ping/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBSOCKET_PREFIX)/include
     31LIBS =
     32EXTRA_CFLAGS =
    3333BINARY = ping
    3434

  • uspace/lib/net/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../..
    31 EXTRA_CFLAGS = -Iinclude -I$(LIBSOCKET_PREFIX)/include
     31EXTRA_CFLAGS = -Iinclude
    3232LIBRARY = libnet
    3333

  • uspace/lib/net/netif/netif_local.c

    r514ee46 rf63a591d  
    4848#include <net/packet.h>
    4949#include <packet_client.h>
    50 #include <packet/packet_server.h>
    5150#include <packet_remote.h>
    5251#include <adt/measured_strings.h>

  • uspace/lib/packet/Makefile

    r514ee46 rf63a591d  
    3030USPACE_PREFIX = ../..
    3131EXTRA_CFLAGS = -Iinclude
    32 LIBRARY = libsocket
     32LIBRARY = libpacket
    3333
    3434SOURCES = \
    35         packet/packet_server.c
     35        generic/packet_server.c
    3636
    3737include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/packet/generic/packet_server.c

    r514ee46 rf63a591d  
    5151#include <net/packet_header.h>
    5252
    53 #include <packet/packet_server.h>
    54 #include <packet/packet_local.h>
     53#include <packet_server.h>
     54#include <packet_local.h>
    5555
    5656#define FREE_QUEUES_COUNT       7

  • uspace/srv/hw/netif/dp8390/Makefile

    r514ee46 rf63a591d  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

  • uspace/srv/net/il/arp/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3333BINARY = arp
    3434

  • uspace/srv/net/il/ip/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3333BINARY = ip
    3434

  • uspace/srv/net/net/Makefile

    r514ee46 rf63a591d  
    3030USPACE_PREFIX = ../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBPACKET_PREFIX)/libpacket.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBPACKET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

  • uspace/srv/net/net/net_standalone.c

    r514ee46 rf63a591d  
    4343#include <adt/measured_strings.h>
    4444#include <adt/module_map.h>
    45 #include <packet/packet_server.h>
     45#include <packet_server.h>
    4646
    4747#include "net.h"

  • uspace/srv/net/netif/lo/Makefile

    r514ee46 rf63a591d  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

  • uspace/srv/net/netstart/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3333
    3434BINARY = netstart

  • uspace/srv/net/nil/eth/Makefile

    r514ee46 rf63a591d  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

  • uspace/srv/net/nil/nildummy/Makefile

    r514ee46 rf63a591d  
    3030USPACE_PREFIX = ../../../..
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    32 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    33 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     32LIBS = $(LIBNET_PREFIX)/libnet.a
     33EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3434
    3535COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common

  • uspace/srv/net/tl/icmp/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3333BINARY = icmp
    3434

  • uspace/srv/net/tl/tcp/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3333BINARY = tcp
    3434

  • uspace/srv/net/tl/udp/Makefile

    r514ee46 rf63a591d  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
    32 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
     31LIBS = $(LIBNET_PREFIX)/libnet.a
     32EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
    3333BINARY = udp
    3434
Note: See TracChangeset for help on using the changeset viewer.