From 27f85fc523102f89c3fc1546ae500816ccbffc8a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 13 Apr 2016 17:05:55 -0400 Subject: Don't build split alpine and laguna support Before: text data bss dec hex filename 25772 2040 16 27828 6cb4 src/.libs/cirrus_alpine.so 11429 1552 112 13093 3325 src/.libs/cirrus_drv.so 21968 2016 16 24000 5dc0 src/.libs/cirrus_laguna.so 59169 5608 114 64921 fd99 (TOTALS) After: text data bss dec hex filename 47831 3840 112 51783 ca47 src/.libs/cirrus_drv.so So, in the worst case, you're using roughly two more pages for (clean, evictable) text, but two fewer (dirty) pages for data and bss. Fixing this also allows the X server to clean up module loading a bit by enforcing the _drv.so suffix, and since this is the only driver pulling such shenanigans... Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- src/Makefile.am | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 36b8d8b..2ceb828 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,32 +35,20 @@ cirrus_drv_la_SOURCES = \ CirrusClk.c \ cir_shadow.c \ cir_pcirename.h \ - compat-api.h - -cirrus_alpine_la_LTLIBRARIES = cirrus_alpine.la -cirrus_alpine_la_LDFLAGS = -module -avoid-version -cirrus_alpine_ladir = @moduledir@/drivers -cirrus_alpine_la_SOURCES = \ + compat-api.h \ alp_driver.c \ alp.h \ alp_hwcurs.c \ - alp_i2c.c -if XAA -cirrus_alpine_la_SOURCES += \ - alp_xaa.c \ - alp_xaam.c -endif - -cirrus_laguna_la_LTLIBRARIES = cirrus_laguna.la -cirrus_laguna_la_LDFLAGS = -module -avoid-version -cirrus_laguna_ladir = @moduledir@/drivers -cirrus_laguna_la_SOURCES = \ + alp_i2c.c \ lg_driver.c \ lg.h \ lg_hwcurs.c \ lg_i2c.c + if XAA -cirrus_laguna_la_SOURCES += \ +cirrus_drv_la_SOURCES += \ + alp_xaa.c \ + alp_xaam.c lg_xaa.c \ lg_xaa.h endif -- cgit v1.2.3