diff options
Diffstat (limited to 'libc/inet')
| -rw-r--r-- | libc/inet/Makefile | 47 | ||||
| -rw-r--r-- | libc/inet/rpc/Makefile | 30 |
2 files changed, 36 insertions, 41 deletions
diff --git a/libc/inet/Makefile b/libc/inet/Makefile index 6d59e1856..e5c355d69 100644 --- a/libc/inet/Makefile +++ b/libc/inet/Makefile @@ -24,19 +24,23 @@ TOPDIR=../../ include $(TOPDIR)Rules.mak -ifeq ($(strip $(UCLIBC_HAS_RPC)),y) - DIRS=rpc -else - DIRS= +ifeq ($(UCLIBC_HAS_THREADS),y) +CFLAGS += $(PTINC) endif + ALL_SUBDIRS = rpc -MSRC=addr.c -MOBJ=inet_aton.o inet_addr.o inet_ntoa.o inet_makeaddr.o inet_lnaof.o \ +DIRS = +ifeq ($(UCLIBC_HAS_RPC),y) +DIRS += rpc +endif + +MSRC := addr.c +MOBJ := inet_aton.o inet_addr.o inet_ntoa.o inet_makeaddr.o inet_lnaof.o \ inet_netof.o -MSRC2=resolv.c -MOBJ2=encodeh.o decodeh.o encoded.o decoded.o lengthd.o encodeq.o \ +MSRC2 := resolv.c +MOBJ2 := encodeh.o decodeh.o encoded.o decoded.o lengthd.o encodeq.o \ decodeq.o lengthq.o encodea.o decodea.o encodep.o decodep.o \ formquery.o dnslookup.o resolveaddress.o opennameservers.o \ closenameservers.o resolvename.o gethostbyname.o res_init.o \ @@ -45,48 +49,41 @@ MOBJ2=encodeh.o decodeh.o encoded.o decoded.o lengthd.o encodeq.o \ gethostbyname_r.o gethostbyname2_r.o gethostbyaddr_r.o \ res_comp.o ns_name.o -MSRC3=socketcalls.c -MOBJ3= accept.o bind.o connect.o getpeername.o getsockname.o getsockopt.o \ +MSRC3 := socketcalls.c +MOBJ3 := accept.o bind.o connect.o getpeername.o getsockname.o getsockopt.o \ listen.o recv.o recvfrom.o recvmsg.o send.o sendmsg.o sendto.o \ setsockopt.o shutdown.o socket.o socketpair.o -CSRC =getservice.c getproto.c hostid.c getnetent.c getnetbynm.c getnetbyad.c \ +CSRC := getservice.c getproto.c hostid.c getnetent.c getnetbynm.c getnetbyad.c \ inet_net.c ntop.c herror.c if_nametoindex.c gai_strerror.c getaddrinfo.c \ in6_addr.c ether_addr.c ntohl.c -COBJS=$(patsubst %.c,%.o, $(CSRC)) - -ifeq ($(UCLIBC_HAS_THREADS),y) -CFLAGS += $(PTINC) -endif +COBJ := $(patsubst %.c,%.o, $(CSRC)) -OBJS=$(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJS) +OBJS := $(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJ) -OBJ_LIST=../obj.inet +OBJ_LIST := ../obj.inet all: $(OBJ_LIST) subdirs $(OBJ_LIST): $(OBJS) - echo $(patsubst %, inet/%, $(OBJS)) > $(OBJ_LIST) + $(STRIPTOOL) -x -R .note -R .comment $^ + echo $(patsubst %, inet/%, $^) > $@ $(MOBJ): $(MSRC) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o - $(STRIPTOOL) -x -R .note -R .comment $*.o $(MOBJ2): $(MSRC2) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o - $(STRIPTOOL) -x -R .note -R .comment $*.o $(MOBJ3): $(MSRC3) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o - $(STRIPTOOL) -x -R .note -R .comment $*.o -$(COBJS): %.o : %.c +$(COBJ): %.o : %.c $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o clean: subdirs_clean - $(RM) *.[oa] *~ core + $(RM) *.o *~ core subdirs: $(patsubst %, _dir_%, $(DIRS)) subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) diff --git a/libc/inet/rpc/Makefile b/libc/inet/rpc/Makefile index 72dba26c5..474ed6484 100644 --- a/libc/inet/rpc/Makefile +++ b/libc/inet/rpc/Makefile @@ -24,8 +24,12 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak -ifeq ($(strip $(UCLIBC_HAS_FULL_RPC)),y) -CSRC :=auth_none.c auth_unix.c authunix_prot.c bindresvport.c \ +ifeq ($(UCLIBC_HAS_THREADS),y) +CFLAGS += $(PTINC) +endif + +ifeq ($(UCLIBC_HAS_FULL_RPC),y) +CSRC := auth_none.c auth_unix.c authunix_prot.c bindresvport.c \ clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \ clnt_udp.c rpc_dtablesize.c get_myaddress.c getrpcent.c getrpcport.c \ pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c \ @@ -37,7 +41,7 @@ CSRC :=auth_none.c auth_unix.c authunix_prot.c bindresvport.c \ rexec.c sa_len.c ruserpass.c rpc_thread.c else # For now, only compile the stuff needed to do an NFS mount.... -CSRC:=create_xid.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \ +CSRC := create_xid.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \ pmap_prot.c pmap_prot2.c clnt_simple.c clnt_perror.c \ clnt_tcp.c clnt_udp.c bindresvport.c authunix_prot.c \ auth_none.c auth_unix.c xdr.c xdr_array.c xdr_rec.c \ @@ -47,24 +51,18 @@ CSRC:=create_xid.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \ getrpcent.c endif -COBJS=$(patsubst %.c,%.o, $(CSRC)) - -ifeq ($(UCLIBC_HAS_THREADS),y) -CFLAGS += $(PTINC) -endif - -OBJS=$(COBJS) +OBJS := $(patsubst %.c,%.o, $(CSRC)) -OBJ_LIST=../../obj.inet.rpc +OBJ_LIST := ../../obj.inet.rpc all: $(OBJ_LIST) $(OBJ_LIST): $(OBJS) - echo $(patsubst %, inet/rpc/%, $(OBJS)) > $(OBJ_LIST) + $(STRIPTOOL) -x -R .note -R .comment $^ + echo $(patsubst %, inet/rpc/%, $^) > $@ -$(COBJS): %.o : %.c - $(CC) $(CFLAGS) $(PTINC) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o +$(OBJS): %.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ clean: - $(RM) *.[oa] *~ core + $(RM) *.o *~ core |