diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-05-29 17:53:42 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-29 17:53:42 -0700 |
| commit | 0596155be3f9cc9d3eb385497ee79935c69ec042 (patch) | |
| tree | 1f0eb238994dbb887504f1f8d630987c340ce92a /com32 | |
| parent | 448ff1d2d1e5052342312643d807040a9950e0f5 (diff) | |
| download | syslinux-0596155be3f9cc9d3eb385497ee79935c69ec042.tar.gz | |
Centralize configurables; better "make install" etc
Begin the process of centralizing configurables.
Improve "make install" and "make netinstall"; add "make
extbootinstall".
Diffstat (limited to 'com32')
| -rw-r--r-- | com32/lib/MCONFIG | 13 | ||||
| -rw-r--r-- | com32/lib/Makefile | 3 | ||||
| -rw-r--r-- | com32/libutil/Makefile | 3 | ||||
| -rw-r--r-- | com32/menu/Makefile | 3 | ||||
| -rw-r--r-- | com32/modules/Makefile | 3 | ||||
| -rw-r--r-- | com32/samples/Makefile | 1 |
6 files changed, 10 insertions, 16 deletions
diff --git a/com32/lib/MCONFIG b/com32/lib/MCONFIG index 2e36597b..b569abff 100644 --- a/com32/lib/MCONFIG +++ b/com32/lib/MCONFIG @@ -1,21 +1,12 @@ # -*- makefile -*- -TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX) -CC = gcc - -gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \ - then echo $(1); else echo $(2); fi; rm -f $$tmpf) +topdir = ../.. +include $(topdir)/MCONFIG GCCOPT := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) -LD = ld INCLUDE = -I. -AR = ar -RANLIB = ranlib -NM = nm -PERL = perl STRIP = strip --strip-all -R .comment -R .note -OBJCOPY = objcopy # zlib and libpng configuration flags LIBFLAGS = -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO \ diff --git a/com32/lib/Makefile b/com32/lib/Makefile index c2c80362..74f3d7ee 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -96,7 +96,8 @@ LIBOBJS = \ BINDIR = /usr/bin LIBDIR = /usr/lib -AUXDIR = $(LIBDIR)/syslinux +DATADIR = /usr/share +AUXDIR = $(DATADIR)/syslinux INCDIR = /usr/include COM32DIR = $(AUXDIR)/com32 diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index 4ae9af48..01fefac3 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -61,7 +61,8 @@ LNXLIBOBJS = $(patsubst %.o,%.lo,$(LIBOBJS)) BINDIR = /usr/bin LIBDIR = /usr/lib -AUXDIR = $(LIBDIR)/syslinux +DATADIR = /usr/share +AUXDIR = $(DATADIR)/syslinux INCDIR = /usr/include COM32DIR = $(AUXDIR)/com32 diff --git a/com32/menu/Makefile b/com32/menu/Makefile index 17d6f5f8..f37e479c 100644 --- a/com32/menu/Makefile +++ b/com32/menu/Makefile @@ -47,7 +47,8 @@ LNXLIBS = ../libutil/libutil_lnx.a BINDIR = /usr/bin LIBDIR = /usr/lib -AUXDIR = $(LIBDIR)/syslinux +DATADIR = /usr/share +AUXDIR = $(DATADIR)/syslinux INCDIR = /usr/include COM32DIR = $(AUXDIR)/com32 diff --git a/com32/modules/Makefile b/com32/modules/Makefile index d67f997d..dc114f57 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -47,7 +47,8 @@ LNXLIBS = ../libutil/libutil_lnx.a BINDIR = /usr/bin LIBDIR = /usr/lib -AUXDIR = $(LIBDIR)/syslinux +DATADIR = /usr/share +AUXDIR = $(DATADIR)/syslinux INCDIR = /usr/include COM32DIR = $(AUXDIR)/com32 diff --git a/com32/samples/Makefile b/com32/samples/Makefile index bad0676f..6ea3c776 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -38,7 +38,6 @@ LNXLDFLAGS = -g SFLAGS = -D__COM32__ -march=i386 LDFLAGS = -T ../lib/com32.ld OBJCOPY = objcopy -PPMTOLSS16 = ../ppmtolss16 LIBGCC := $(shell $(CC) --print-libgcc) LIBS = ../libutil/libutil_com.a ../lib/libcom32.a $(LIBGCC) LNXLIBS = ../libutil/libutil_lnx.a |