Changeset dd695d81 in rtems


Ignore:
Timestamp:
Dec 12, 2002, 12:15:00 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
131814f
Parents:
59a01a6e
Message:

2002-12-12 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Merge-in kern/Makefile.am, net/Makefile.am, netinet/Makefile.am, netinet/Makefile.am, nfs/Makefile.am, rtems/Makefile.am.
  • kern/Makefile.am: Remove.
  • net/Makefile.am: Remove.
  • netinet/Makefile.am: Remove.
  • nfs/Makefile.am: Remove.
  • rtems/Makefile.am: Remove.
  • wrapup/Makefile.am: Reflect changes above.
  • configure.ac: Ditto.
Location:
cpukit/libnetworking
Files:
5 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libnetworking/ChangeLog

    r59a01a6e rdd695d81  
     12002-12-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in kern/Makefile.am, net/Makefile.am,
     4        netinet/Makefile.am, netinet/Makefile.am, nfs/Makefile.am,
     5        rtems/Makefile.am.
     6        * kern/Makefile.am: Remove.
     7        * net/Makefile.am: Remove.
     8        * netinet/Makefile.am: Remove.
     9        * nfs/Makefile.am: Remove.
     10        * rtems/Makefile.am: Remove.
     11        * wrapup/Makefile.am: Reflect changes above.
     12        * configure.ac: Ditto.
     13
    1142002-12-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    215
  • cpukit/libnetworking/Makefile.am

    r59a01a6e rdd695d81  
    55ACLOCAL_AMFLAGS = -I ../aclocal
    66
    7 SUBDIRS = . kern lib libc net netinet nfs rtems
     7include $(top_srcdir)/../automake/multilib.am
     8include $(top_srcdir)/../automake/compile.am
     9include $(top_srcdir)/../automake/lib.am
     10
     11# Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h
     12AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
     13    -DBOOTP_COMPAT
     14
     15LIB = $(ARCH)/libnetworking.a
     16
     17SUBDIRS = . lib libc
    818SUBDIRS += wrapup
    919
     
    3343    $(include_arpa_HEADERS:%=$(PROJECT_INCLUDE)/%)
    3444
     45## kern
     46
     47kern_C_FILES = kern/kern_subr.c kern/uipc_domain.c kern/uipc_mbuf.c \
     48   kern/uipc_socket.c kern/uipc_socket2.c
     49OBJS = $(kern_C_FILES:kern/%.c=$(ARCH)/%.$(OBJEXT))
     50
     51$(ARCH)/%.$(OBJEXT): kern/%.c
     52        ${COMPILE} -o $@ -c $<
     53
     54EXTRA_DIST = $(kern_C_FILES)
     55
    3556## machine
    3657
     
    6081PREINSTALL_FILES += $(PROJECT_INCLUDE)/net \
    6182    $(include_net_HEADERS:%=$(PROJECT_INCLUDE)/%)
     83
     84net_C_FILES = net/if.c net/if_ethersubr.c net/if_loop.c net/radix.c \
     85    net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c net/if_ppp.c \
     86    net/ppp_tty.c net/pppcompress.c
     87OBJS += $(net_C_FILES:net/%.c=$(ARCH)/%.$(OBJEXT))
     88
     89$(ARCH)/%.$(OBJEXT): net/%.c
     90        ${COMPILE} -o $@ -c $<
     91
     92EXTRA_DIST += $(net_C_FILES)
    6293
    6394## netinet
     
    78109    $(include_netinet_HEADERS:%=$(PROJECT_INCLUDE)/%)
    79110
     111netinet_C_FILES = netinet/if_ether.c netinet/igmp.c netinet/in.c \
     112    netinet/in_cksum.c netinet/in_pcb.c netinet/in_proto.c netinet/in_rmx.c \
     113    netinet/ip_divert.c netinet/ip_fw.c netinet/ip_icmp.c netinet/ip_input.c \
     114    netinet/ip_mroute.c netinet/ip_output.c netinet/raw_ip.c \
     115    netinet/tcp_debug.c netinet/tcp_input.c netinet/tcp_output.c \
     116    netinet/tcp_subr.c netinet/tcp_timer.c netinet/tcp_usrreq.c \
     117    netinet/udp_usrreq.c
     118OBJS += $(C_FILES:netinet/%.c=$(ARCH)/%.$(OBJEXT))
     119
     120$(ARCH)/%.$(OBJEXT): netinet/%.c
     121        ${COMPILE} -o $@ -c $<
     122
     123EXTRA_DIST += $(netinet_C_FILES)
     124
    80125## nfs
    81126
     
    90135PREINSTALL_FILES += $(PROJECT_INCLUDE)/nfs \
    91136    $(include_nfs_HEADERS:%=$(PROJECT_INCLUDE)/%)
     137
     138nfs_C_FILES = nfs/bootp_subr.c
     139OBJS += $(nfs_C_FILES:nfs/%.c=$(ARCH)/%.$(OBJEXT))
     140
     141$(ARCH)/%.$(OBJEXT): nfs/%.c
     142        ${COMPILE} -o $@ -c $<
     143
     144EXTRA_DIST += $(nfs_C_FILES)
     145
     146## rtems
     147
     148include_rtemsdir = $(includedir)/rtems
     149
     150include_rtems_HEADERS = rtems/rtems_bsdnet.h rtems/rtems_bsdnet_internal.h \
     151    rtems/tftp.h rtems/ftpfs.h rtems/mkrootfs.h
     152
     153$(PROJECT_INCLUDE)/rtems:
     154        @$(mkinstalldirs) $@
     155
     156PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     157    $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
     158
     159rtems_C_FILES = rtems/sghostname.c rtems/issetugid.c rtems/rtems_glue.c rtems/rtems_syscall.c \
     160    rtems/rtems_bootp.c rtems/rtems_showmbuf.c rtems/rtems_showroute.c rtems/rtems_showifstat.c \
     161    rtems/rtems_showipstat.c rtems/rtems_showicmpstat.c rtems/rtems_showtcpstat.c \
     162    rtems/rtems_showudpstat.c rtems/rtems_select.c rtems/mkrootfs.c
     163OBJS += $(rtems_C_FILES:rtems/%.c=$(ARCH)/%.$(OBJEXT))
     164
     165$(ARCH)/%.$(OBJEXT): rtems/%.c
     166        ${COMPILE} -o $@ -c $<
     167
     168EXTRA_DIST += $(rtems_C_FILES)
    92169
    93170## sys
     
    125202        $(INSTALL_DATA) $< $@
    126203
    127 all-local: $(PREINSTALL_FILES)
     204$(LIB): $(OBJS)
     205        $(make-library)
     206
     207all-local: $(PREINSTALL_FILES) $(ARCH) $(LIB)
    128208
    129209include $(top_srcdir)/../automake/subdirs.am
  • cpukit/libnetworking/configure.ac

    r59a01a6e rdd695d81  
    2929# Explicitly list all Makefiles here
    3030AC_CONFIG_FILES([Makefile
    31 kern/Makefile
    3231lib/Makefile
    3332libc/Makefile
    34 net/Makefile
    35 netinet/Makefile
    36 nfs/Makefile
    37 rtems/Makefile
    3833wrapup/Makefile
    3934])
  • cpukit/libnetworking/wrapup/Makefile.am

    r59a01a6e rdd695d81  
    44
    55
    6 NET_O_PIECES = kern lib libc net netinet nfs rtems
    7 OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT))
     6NET_O_PIECES = lib libc
     7OBJS = ../$(ARCH)/*.$(OBJEXT)
     8OBJS += $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT))
    89LIB = $(ARCH)/libnetworking.a
    910
Note: See TracChangeset for help on using the changeset viewer.