aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-05-29 17:53:42 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-05-29 17:53:42 -0700
commit0596155be3f9cc9d3eb385497ee79935c69ec042 (patch)
tree1f0eb238994dbb887504f1f8d630987c340ce92a /utils
parent448ff1d2d1e5052342312643d807040a9950e0f5 (diff)
downloadsyslinux-0596155be3f9cc9d3eb385497ee79935c69ec042.tar.gz
syslinux-0596155be3f9cc9d3eb385497ee79935c69ec042.tar.xz
syslinux-0596155be3f9cc9d3eb385497ee79935c69ec042.zip
Centralize configurables; better "make install" etc
Begin the process of centralizing configurables. Improve "make install" and "make netinstall"; add "make extbootinstall".
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile24
1 files changed, 8 insertions, 16 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 0c5a3636..64f8236f 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -13,29 +13,17 @@
#
# SYSLINUX utilities
#
-# No builtin rules
-MAKEFLAGS += -r
-MAKE += -r
-TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
-
-CC = gcc
-
-gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) dummy.c -o $$tmpf 2>/dev/null; \
- then echo '$(1)'; else echo '$(2)'; fi; rm -f $$tmpf)
-
-comma := ,
-LDHASH := $(call gcc_ok,-Wl$(comma)--hash-style=both,)
+topdir = ..
+include $(topdir)/MCONFIG
CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-LDFLAGS = -O2 -s $(LDHASH)
-LD = ld
-PERL = perl
+LDFLAGS = -O2 -s
TARGETS = mkdiskimage gethostip
ASIS = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi
-all: mkdiskimage gethostip
+all: $(TARGETS)
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
@@ -56,3 +44,7 @@ clean: tidy
spotless: clean
installer: all
+
+install: installer
+ mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
+ install -m 755 $(TARGETS) $(ASIS) $(INSTALLROOT)$(BINDIR)