1 files changed, 7 insertions, 16 deletions

diff --git a/src/so.mk b/src/so.mk
index e464a7bff..dadffc52f 100644
--- a/src/so.mk
+++ b/src/so.mk
@@ -3,20 +3,11 @@
 # Note: $(ROOT)/config.mk must be included before this file.
 #
 # The includer should probably define SO and TARGET and may also want to define
-# MOD_HDRS, MOD_SRCS, MOD_OBJS, TOCLEAN and TODISTCLEAN.
+# EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES.
 
-HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS)
-SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS)
-OBJS := $(SRCS:.c=.o) $(MOD_OBJS)
-
-SO_CFLAGS = \
-        -ggdb -O2 -DVERSION='"$(VERSION)"' \
-        -Wall -Wextra $(HAVE_FATAL_WARNINGS) \
-        -Wformat -Wformat-security \
-        -fstack-protector-all -D_FORTIFY_SOURCE=2 \
-        -fPIC
-
-SO_LDFLAGS = -pie -fPIE -Wl,-z,relro -Wl,-z,now
+HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS)
+SRCS := $(sort $(wildcard *.c))
+OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS)
 
 .PHONY: all
 all: $(TARGET)
@@ -25,10 +16,10 @@ all: $(TARGET)
         $(CC) $(SO_CFLAGS) $(CFLAGS) $(INCLUDE) -c $< -o $@
 
 $(SO): $(OBJS) $(ROOT)/config.mk
-        $(CC) $(SO_LDFLAGS) -shared -fPIC -z relro $(LDFLAGS) -o $@ $(OBJS) -ldl
+        $(CC) $(SO_LDFLAGS) -shared $(LDFLAGS) -o $@ $(OBJS) -ldl
 
 .PHONY: clean
-clean:; rm -fr $(OBJS) $(SO) *.plist $(TOCLEAN)
+clean:; rm -fr $(SO) $(CLEANFILES)
 
 .PHONY: distclean
-distclean: clean; rm -fr $(TODISTCLEAN)
+distclean: clean