patch-2.2.3 linux/net/irda/irlan/Makefile

Next file: linux/net/irda/irlan/irlan_cli.c
Previous file: linux/net/irda/irlan/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.2/linux/net/irda/irlan/Makefile linux/net/irda/irlan/Makefile
@@ -9,44 +9,13 @@
 
 MOD_LIST_NAME := IRDA_MODULES
 O_TARGET := irlan.o
-O_OBJS	 := irlan_common.o irlan_eth.o irlan_event.o
+O_OBJS	 := irlan_common.o irlan_eth.o irlan_event.o irlan_client.o irlan_provider.o irlan_filter.o irlan_provider_event.o irlan_client_event.o
 M_OBJS   := $(O_TARGET)
 MI_OBJS  :=
 
 OX_OBJS  += 
 
-ifeq ($(CONFIG_IRLAN_CLIENT),y)
-O_OBJS += irlan_cli.o irlan_cli_event.o
-else
-  ifeq ($(CONFIG_IRLAN_CLIENT),m)
-#  MI_OBJS += irlan_cli.o irlan_cli_event.o
-  M_OBJS += irlan_client.o
-  endif
-endif
-
-ifeq ($(CONFIG_IRLAN_SERVER),y)
-O_OBJS += irlan_srv.o irlan_srv_event.o
-else
-  ifeq ($(CONFIG_IRLAN_SERVER),m)
-#  MI_OBJS += irlan_srv.o irlan_srv_event.o
-  M_OBJS += irlan_server.o
-  endif
-endif
-
-# Special rule to build the composite modules
-ifeq ($(CONFIG_IRLAN),m)
-irlan_client.o: irlan_cli.o irlan_cli_event.o
-	$(LD) $(LD_RFLAG) -r -o $@ irlan_cli.o irlan_cli_event.o
-
-irlan_server.o: irlan_srv.o irlan_srv_event.o
-	$(LD) $(LD_RFLAG) -r -o $@ irlan_srv.o irlan_srv_event.o
-endif
-
 include $(TOPDIR)/Rules.make
 
 tar:
 		tar -cvf /dev/f1 .
-
-
-
-

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)