summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am8
-rw-r--r--src/synaptics.c2
-rw-r--r--src/synproto.h5
3 files changed, 11 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0637445..ff513f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,11 +32,15 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c synapticsstr.h \
- alpscomm.c \
- ps2comm.c ps2comm.h \
synproto.h \
properties.c
+if BUILD_PS2COMM
+@DRIVER_NAME@_drv_la_SOURCES += \
+ alpscomm.c \
+ ps2comm.c ps2comm.h
+endif
+
if BUILD_EVENTCOMM
@DRIVER_NAME@_drv_la_SOURCES += \
eventcomm.c eventcomm.h
diff --git a/src/synaptics.c b/src/synaptics.c
index cdb894b..1233917 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -146,8 +146,10 @@ const static struct {
#ifdef BUILD_PSMCOMM
{"psm", &psm_proto_operations},
#endif
+#ifdef BUILD_PS2COMM
{"psaux", &psaux_proto_operations},
{"alps", &alps_proto_operations},
+#endif
{NULL, NULL}
};
diff --git a/src/synproto.h b/src/synproto.h
index 54a64eb..251dc84 100644
--- a/src/synproto.h
+++ b/src/synproto.h
@@ -79,14 +79,15 @@ struct SynapticsProtocolOperations {
void (*ReadDevDimensions)(InputInfoPtr pInfo);
};
+#ifdef BUILD_PS2COMM
extern struct SynapticsProtocolOperations psaux_proto_operations;
+extern struct SynapticsProtocolOperations alps_proto_operations;
+#endif /* BUILD_PS2COMM */
#ifdef BUILD_EVENTCOMM
extern struct SynapticsProtocolOperations event_proto_operations;
#endif /* BUILD_EVENTCOMM */
#ifdef BUILD_PSMCOMM
extern struct SynapticsProtocolOperations psm_proto_operations;
#endif /* BUILD_PSMCOMM */
-extern struct SynapticsProtocolOperations alps_proto_operations;
-
#endif /* _SYNPROTO_H_ */