aboutsummaryrefslogtreecommitdiffstats
path: root/mk
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-19 10:55:13 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-19 12:55:05 +0100
commitb26d1c8642a8d68e02ac06f427c3eb47185d735a (patch)
treedfaa565e3bb1df4f9f056043534d2319089d0673 /mk
parent973b41dc30f1174a4b5fdbbe990c8e76a96aac85 (diff)
downloadsyslinux-b26d1c8642a8d68e02ac06f427c3eb47185d735a.tar.gz
syslinux-b26d1c8642a8d68e02ac06f427c3eb47185d735a.tar.xz
syslinux-b26d1c8642a8d68e02ac06f427c3eb47185d735a.zip
Clean up $(GPLLIB) leak
Modules were linking against com32/gpllib/libcom32gpl.c32 even when NOGPL was set, so remove it from various modules Makefiles and use $(C_LIBS) in mk/elf.mk which already has the conditional-magic for $(GPLLIB). Also, the object files in com32/gpllib/ are not distributed in the release tarballs, which means that if a user does a 'make netinstall' they hit the following install error, install: cannot stat `com32/gpllib/*.c32': No such file or directory Add a $(INSTALLABLE_MODULES) variable to separate the list of build and install modules. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/elf.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/elf.mk b/mk/elf.mk
index 4e76c711..160dadcc 100644
--- a/mk/elf.mk
+++ b/mk/elf.mk
@@ -81,5 +81,5 @@ C_LNXLIBS = $(com32)/libutil/libutil_lnx.a \
%.lnx: %.lo $(LNXLIBS) $(C_LNXLIBS)
$(CC) $(LNXCFLAGS) -o $@ $^
-%.c32: %.o $(LIBS)
+%.c32: %.o $(C_LIBS)
$(LD) $(LDFLAGS) -o $@ $^