diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-10-19 10:55:13 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-10-19 12:55:05 +0100 |
| commit | b26d1c8642a8d68e02ac06f427c3eb47185d735a (patch) | |
| tree | dfaa565e3bb1df4f9f056043534d2319089d0673 /com32 | |
| parent | 973b41dc30f1174a4b5fdbbe990c8e76a96aac85 (diff) | |
| download | syslinux-b26d1c8642a8d68e02ac06f427c3eb47185d735a.tar.gz | |
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 'com32')
| -rw-r--r-- | com32/hdt/Makefile | 4 | ||||
| -rw-r--r-- | com32/modules/Makefile | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile index ff0fa2e2..897b6604 100644 --- a/com32/hdt/Makefile +++ b/com32/hdt/Makefile @@ -20,9 +20,7 @@ MAKEDIR = $(topdir)/mk include $(MAKEDIR)/elf.mk LIBS = ../libupload/libcom32upload.a -C_LIBS += $(com32)/cmenu/libmenu/libmenu.c32 \ - $(com32)/libutil/libutil_com.c32 \ - $(com32)/lib/libcom32.c32 $(com32)/gpllib/libcom32gpl.c32 +C_LIBS += $(com32)/cmenu/libmenu/libmenu.c32 CFLAGS += -I$(com32)/cmenu/libmenu -I$(com32) MODULES = hdt.c32 diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 8f5b7692..dd5f2e04 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -15,9 +15,6 @@ ## COM32 standard modules ## -LIBS = $(com32)/gpllib/libcom32gpl.c32 $(com32)/lib/libcom32.c32 \ - $(com32)/libutil/libutil_com.c32 - topdir = ../.. MAKEDIR = $(topdir)/mk include $(MAKEDIR)/elf.mk @@ -37,7 +34,7 @@ all: $(MODULES) $(TESTFILES) dmitest.o: dmitest.c $(CC) $(CFLAGS) $(GPLINCLUDE) -c -o $@ $< -dmitest.c32 : dmi_utils.o dmitest.o $(GPLLIB) $(LIBS) $(C_LIBS) +dmitest.c32 : dmi_utils.o dmitest.o $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ tidy dist: |