diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-11-26 15:27:55 +0000 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-27 13:12:36 +0000 |
commit | c3e89bdc47f87b4c0753051fe3b6e0450e26f2f7 (patch) | |
tree | 7da7e94641b9ed2513c982eefa64bcc410ab9e80 | |
parent | b2eadc35e99caa2a6aba2fae99031c1073bc6cf5 (diff) | |
download | syslinux-c3e89bdc47f87b4c0753051fe3b6e0450e26f2f7.tar.gz syslinux-c3e89bdc47f87b4c0753051fe3b6e0450e26f2f7.tar.xz syslinux-c3e89bdc47f87b4c0753051fe3b6e0450e26f2f7.zip |
gpllib: Distribute libcom32gpl.c32 in releases
This is a partial revert of commit b26d1c8642a8 ("Clean up $(GPLLIB)
leak"). While we do need to use $(C_LIBS) and respect $(NOGPL), we
should also be distributing libcom32gpl.c32. Now that we have ELF
modules, such as hdt.c32, that need to have some of their symbols
dynamically resolved at runtime we need to distribute libcom32gpl.c32.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | com32/gpllib/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -38,7 +38,7 @@ MODULES = memdisk/memdisk memdump/memdump.com modules/*.com \ com32/elflink/ldlinux/*.c32 com32/cmenu/libmenu/*.c32 # List of module objects that should be installed for all derivatives -INSTALLABLE_MODULES = $(filter-out com32/gpllib%,$(MODULES)) +INSTALLABLE_MODULES = $(MODULES) # syslinux.exe is BTARGET so as to not require everyone to have the # mingw suite installed diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile index 4f41ca8b..92dd20f2 100644 --- a/com32/gpllib/Makefile +++ b/com32/gpllib/Makefile @@ -25,7 +25,7 @@ libcom32gpl.c32 : $(LIBOBJS) $(LD) -shared $(LDFLAGS) -o $@ $^ tidy dist clean: - find . \( -name \*.o -o -name \*.c32 -o -name .\*.d -o -name \*.tmp \) -print0 | \ + find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \ xargs -0r rm -f spotless: clean |