aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-09 14:53:02 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-08-09 14:53:02 -0700
commit9a3a051dc7b897b7d6bae99bf9f791b601096c48 (patch)
treedb608e5459e1e12977f2e089366fbcf9d58ae333
parentfc6cf9bf077bd072273ba47cd9b89e971cdc334c (diff)
parent8b0f75f79811a30cd3f8460e305c6eea82f288a0 (diff)
downloadbak.git-9a3a051dc7b897b7d6bae99bf9f791b601096c48.tar.gz
bak.git-9a3a051dc7b897b7d6bae99bf9f791b601096c48.tar.xz
bak.git-9a3a051dc7b897b7d6bae99bf9f791b601096c48.zip
Merge branch 'dynamic' into elflink
Resolved Conflicts: core/Makefile
-rw-r--r--core/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index 5aa6010b..17dac944 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -41,7 +41,7 @@ BTARGET = kwdhash.gen \
NASMSRC := $(wildcard *.asm)
NASMHDR := $(wildcard *.inc)
CSRC := $(wildcard *.c */*.c)
-SSRC := $(filter-out symbols.S,$(wildcard *.S lzo/*.S))
+SSRC := $(wildcard *.S lzo/*.S)
CHDR := $(wildcard *.h */*.h)
OTHERSRC := keywords
ALLSRC = $(NASMSRC) $(NASMHDR) $(CSRC) $(SSRC) $(CHDR) $(OTHERSRC)