summaryrefslogtreecommitdiffstats
path: root/net/irda/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
commitb63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch)
tree0a343ce219e2b8b38a5d702d66032c57b83d9720 /net/irda/Makefile
parenta9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff)
Merge with 2.4.0-test11.
Diffstat (limited to 'net/irda/Makefile')
-rw-r--r--net/irda/Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/net/irda/Makefile b/net/irda/Makefile
index ac2bdc063..3ab07c88d 100644
--- a/net/irda/Makefile
+++ b/net/irda/Makefile
@@ -7,7 +7,7 @@
#
# Note 2! The CFLAGS definition is now in the main makefile...
-ALL_SUB_DIRS := irlan ircomm compressors
+ALL_SUB_DIRS := irlan irnet ircomm compressors
SUB_DIRS :=
MOD_SUB_DIRS :=
OX_OBJS :=
@@ -17,7 +17,7 @@ O_OBJS := iriap.o iriap_event.o irlmp.o irlmp_event.o irlmp_frame.o \
irlap.o irlap_event.o irlap_frame.o timer.o qos.o irqueue.o \
irttp.o irda_device.o irias_object.o crc.o wrapper.o af_irda.o \
discovery.o parameters.o
-OX_OBJS := irmod.o
+OX_OBJS := irsyms.o
ifeq ($(CONFIG_IRDA),m)
M_OBJS := $(O_TARGET)
@@ -44,6 +44,15 @@ else
endif
endif
+ifeq ($(CONFIG_IRNET),y)
+SUB_DIRS += irnet
+O_OBJS += irnet/irnet.o
+else
+ ifeq ($(CONFIG_IRNET),m)
+ MOD_SUB_DIRS += irnet
+ endif
+endif
+
ifeq ($(CONFIG_IRDA_COMPRESSION),y)
SUB_DIRS += compressors
MOD_IN_SUB_DIRS += compressors