aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
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 /Makefile
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 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 499ca5e3..f25a9229 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ include $(MAKEDIR)/syslinux.mk
# directories.
#
-# List of module objects that should be installed for all derivatives
MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \
com32/menu/*.c32 com32/modules/*.c32 com32/mboot/*.c32 \
com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 \
@@ -38,6 +37,9 @@ MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \
com32/lib/*.c32 com32/libutil/*.c32 com32/gpllib/*.c32 \
com32/elflink/ldlinux/*.c32
+# List of module objects that should be installed for all derivatives
+INSTALLABLE_MODULES = $(filter-out com32/gpllib%,$(MODULES))
+
# syslinux.exe is BTARGET so as to not require everyone to have the
# mingw suite installed
BTARGET = version.gen version.h version.mk
@@ -71,7 +73,7 @@ INSTALL_SBIN = extlinux/extlinux
INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \
core/isolinux.bin core/isolinux-debug.bin \
dos/syslinux.com \
- mbr/*.bin $(MODULES)
+ mbr/*.bin $(INSTALLABLE_MODULES)
INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe
INSTALL_DIAG = diag/mbr/handoff.bin \
diag/geodsp/geodsp1s.img.xz diag/geodsp/geodspms.img.xz
@@ -80,11 +82,11 @@ INSTALL_DIAG = diag/mbr/handoff.bin \
INSTALLSUBDIRS = com32 utils dosutil
# Things to install in /boot/extlinux
-EXTBOOTINSTALL = $(MODULES)
+EXTBOOTINSTALL = $(INSTALLABLE_MODULES)
# Things to install in /tftpboot
NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \
- $(MODULES)
+ $(INSTALLABLE_MODULES)
all:
$(MAKE) all-local