Changeset 489c158 in rtems


Ignore:
Timestamp:
Nov 28, 2003, 1:27:15 PM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
c9cb640e
Parents:
e0d0253
Message:

2003-11-28 Ralf Corsepius <corsepiu@…>

  • libc/Makefile.am: Remove.
  • lib/Makefile.am: Remove.
  • Makefile.am: Merge-in the Makefile.ams above.
Location:
cpukit/libnetworking
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • cpukit/libnetworking/ChangeLog

    re0d0253 r489c158  
     12003-11-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * libc/Makefile.am: Remove.
     4        * lib/Makefile.am: Remove.
     5        * Makefile.am: Merge-in the Makefile.ams above.
     6
    172003-11-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    28

  • cpukit/libnetworking/Makefile.am

    re0d0253 r489c158  
    99include $(top_srcdir)/automake/lib.am
    1010
     11AM_CPPFLAGS += -I$(top_builddir)
     12
     13if HAS_NETWORKING
    1114# Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h
    12 AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
    13     -DBOOTP_COMPAT
    14 
    15 LIB = $(ARCH)/libnetworking.a
    16 
    17 SUBDIRS = . lib libc
    18 
    19 if HAS_NETWORKING
     15libnetworking_CPPFLAGS = -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \
     16    -DDIAGNOSTIC -DBOOTP_COMPAT
     17
     18TMP_LIBS = $(ARCH) $(ARCH)/libnetworking.a
     19
    2020## poll.h is not in the list because RTEMS does not have poll()
    2121## and installing poll.h confuses autoconf.
    … …  
    3535    kern/uipc_domain.c kern/uipc_mbuf.c kern/uipc_socket.c \
    3636    kern/uipc_socket2.c
    37 OBJS = $(kern_C_FILES:kern/%.c=$(ARCH)/%.$(OBJEXT))
     37libnetworking_OBJS = $(kern_C_FILES:kern/%.c=$(ARCH)/%.$(OBJEXT))
    3838
    3939$(ARCH)/%.$(OBJEXT): kern/%.c
    40         ${COMPILE} -o $@ -c $<
     40        ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $<
    4141
    4242EXTRA_DIST = $(kern_C_FILES)
    … …  
    6161    net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c net/if_ppp.c \
    6262    net/ppp_tty.c net/pppcompress.c
    63 OBJS += $(net_C_FILES:net/%.c=$(ARCH)/%.$(OBJEXT))
     63libnetworking_OBJS += $(net_C_FILES:net/%.c=$(ARCH)/%.$(OBJEXT))
    6464
    6565$(ARCH)/%.$(OBJEXT): net/%.c
    66         ${COMPILE} -o $@ -c $<
     66        ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $<
    6767
    6868EXTRA_DIST += $(net_C_FILES)
    … …  
    8787    netinet/tcp_subr.c netinet/tcp_timer.c netinet/tcp_usrreq.c \
    8888    netinet/udp_usrreq.c
    89 OBJS += $(netinet_C_FILES:netinet/%.c=$(ARCH)/%.$(OBJEXT))
     89libnetworking_OBJS += $(netinet_C_FILES:netinet/%.c=$(ARCH)/%.$(OBJEXT))
    9090
    9191$(ARCH)/%.$(OBJEXT): netinet/%.c
    92         ${COMPILE} -o $@ -c $<
     92        ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $<
    9393
    9494EXTRA_DIST += $(netinet_C_FILES)
    … …  
    102102
    103103nfs_C_FILES = nfs/bootp_subr.c
    104 OBJS += $(nfs_C_FILES:nfs/%.c=$(ARCH)/%.$(OBJEXT))
     104libnetworking_OBJS += $(nfs_C_FILES:nfs/%.c=$(ARCH)/%.$(OBJEXT))
    105105
    106106$(ARCH)/%.$(OBJEXT): nfs/%.c
    107         ${COMPILE} -o $@ -c $<
     107        ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $<
    108108
    109109EXTRA_DIST += $(nfs_C_FILES)
    … …  
    122122    rtems/rtems_showtcpstat.c rtems/rtems_showudpstat.c rtems/rtems_select.c \
    123123    rtems/mkrootfs.c rtems/rtems_bsdnet_malloc_starvation.c
    124 OBJS += $(rtems_C_FILES:rtems/%.c=$(ARCH)/%.$(OBJEXT))
     124libnetworking_OBJS += $(rtems_C_FILES:rtems/%.c=$(ARCH)/%.$(OBJEXT))
    125125
    126126$(ARCH)/%.$(OBJEXT): rtems/%.c
    127         ${COMPILE} -o $@ -c $<
     127        ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $<
    128128
    129129EXTRA_DIST += $(rtems_C_FILES)
    … …  
    146146include_vm_HEADERS = vm/vm.h vm/vm_extern.h vm/vm_kern.h vm/vm_param.h
    147147
     148## libc
     149
     150libc_C_FILES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \
     151    libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \
     152    libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \
     153    libc/getnetbynis.c libc/getnetnamadr.c libc/getproto.c \
     154    libc/getprotoent.c libc/getprotoname.c libc/getservbyname.c \
     155    libc/getservbyport.c libc/getservent.c libc/herror.c libc/inet_addr.c \
     156    libc/inet_lnaof.c libc/inet_makeaddr.c libc/inet_netof.c \
     157    libc/inet_network.c libc/inet_ntoa.c libc/inet_ntop.c libc/inet_pton.c \
     158    libc/linkaddr.c libc/map_v4v6.c libc/nsap_addr.c libc/ns_name.c \
     159    libc/ns_netint.c libc/ns_parse.c libc/ns_print.c libc/ns_ttl.c \
     160    libc/res_comp.c libc/res_data.c libc/res_debug.c libc/res_init.c \
     161    libc/res_mkquery.c libc/res_mkupdate.c libc/res_query.c libc/res_send.c \
     162    libc/res_stubs.c libc/res_update.c libc/strsep.c libc/rcmd.c
     163libc_OBJS = $(libc/C_FILES:libc/%.c=libc/$(ARCH)/%.$(OBJEXT))
     164
     165man_MANS = libc/addr2ascii.3 libc/byteorder.3 libc/ethers.3 \
     166    libc/gethostbyname.3 libc/getnetent.3 libc/getprotoent.3 \
     167    libc/getservent.3 libc/inet.3 libc/iso_addr.3 libc/linkaddr.3 libc/ns.3 \
     168    libc/rcmd.3 libc/resolver.3
     169
     170libc_CPPFLAGS = -DNOPOLL -DNOSELECT
     171
     172libc/$(ARCH):
     173        @$(mkinstalldirs) $@
     174libc/$(ARCH)/%.$(OBJEXT): libc/%.c
     175        ${COMPILE} $(libc_CPPFLAGS) -o $@ -c $<
     176libc/$(ARCH)/libc.a: $(libc_OBJS)
     177        $(make-library)
     178
     179TMP_LIBS += libc/$(ARCH) libc/$(ARCH)/libc.a
     180
     181CLEANDIRS = libc/o-optimize libc/o-debug
     182
     183EXTRA_DIST += libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \
     184    libc/base64.c libc/byteorder.3 libc/ether_addr.c libc/ethers.3 \
     185    libc/gethostbydns.c libc/gethostbyht.c libc/gethostbyname.3 \
     186    libc/gethostbynis.c libc/gethostnamadr.c libc/gethostname.c \
     187    libc/getnetbydns.c libc/getnetbyht.c libc/getnetbynis.c libc/getnetent.3 \
     188    libc/getnetnamadr.c libc/getproto.c libc/getprotoent.3 \
     189    libc/getprotoent.c libc/getprotoname.c libc/getservbyname.c \
     190    libc/getservbyport.c libc/getservent.3 libc/getservent.c libc/herror.c \
     191    libc/inet.3 libc/inet_addr.c libc/inet_lnaof.c libc/inet_makeaddr.c \
     192    libc/inet_net_ntop.c libc/inet_net_pton.c libc/inet_neta.c \
     193    libc/inet_netof.c libc/inet_network.c libc/inet_ntoa.c libc/inet_ntop.c \
     194    libc/inet_pton.c libc/map_v4v6.c libc/linkaddr.3 libc/linkaddr.c \
     195    libc/ns.3 libc/ns_addr.c libc/ns_name.c libc/ns_netint.c libc/ns_ntoa.c \
     196    libc/ns_parse.c libc/ns_print.c libc/ns_ttl.c libc/nsap_addr.c \
     197    libc/rcmd.3 libc/rcmd.c libc/recv.c libc/res_comp.c libc/res_config.h \
     198    libc/res_data.c libc/res_debug.c libc/res_init.c libc/res_mkquery.c \
     199    libc/res_mkupdate.c libc/res_query.c libc/res_send.c libc/res_stubs.c \
     200    libc/res_update.c libc/resolver.3 libc/send.c libc/strsep.c
     201
     202## lib
     203
     204lib_C_FILES = lib/getprotoby.c lib/rtems_bsdnet_ntp.c lib/ftpfs.c \
     205    lib/syslog.c lib/tftpDriver.c
     206lib_OBJS = $(lib_C_FILES:lib/%.c=lib/$(ARCH)/%.$(OBJEXT))
     207
     208lib_CPPFLAGS = -DNOPOLL -DNOSELECT
     209
     210lib/$(ARCH):
     211        @$(mkinstalldirs) $@
     212lib/$(ARCH)/%.$(OBJEXT): lib/%.c
     213        ${COMPILE} $(lib_CPPFLAGS) -o $@ -c $<
     214lib/$(ARCH)/lib.a: $(lib_OBJS)
     215        $(make-library)
     216
     217TMP_LIBS += lib/$(ARCH) lib/$(ARCH)/lib.a
     218
     219CLEANDIRS += lib/o-optimize lib/o-debug
     220
     221EXTRA_DIST += lib/README lib/getprotoby.c lib/rtems_bsdnet_ntp.c \
     222    lib/syslog.c lib/tftpDriver.c
     223
    148224# ---
    149225
    150 $(LIB): $(OBJS)
     226$(ARCH)/libnetworking.a: $(libnetworking_OBJS)
    151227        $(make-library)
    152228
    153 all-local: $(PREINSTALL_FILES) $(ARCH) $(LIB)
     229all-local: $(PREINSTALL_FILES) $(TMP_LIBS)
    154230endif
    155231
Note: See TracChangeset for help on using the changeset viewer.