diff --git a/Makefile b/Makefile
index 07a0c25..881cbd0 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,12 @@ $(SOURCES): $(MAIN)
 
 tangle: $(SOURCES)
 
-clean:
+clean-emacs:
 	-rm -v $(SOURCES)
 
+clean:
+	-rm -v $(OBJ_FILES) $(DEP_FILES)
+
 clean-all: bench-clean clean
 
 bench: $(BENCH_TARGETS)
diff --git a/etc/config/gcc.mk b/etc/config/gcc.mk
index 4ed21b5..3939bcd 100644
--- a/etc/config/gcc.mk
+++ b/etc/config/gcc.mk
@@ -10,8 +10,8 @@ CXXFLAGS += -fPIC
 LDFLAGS += -fopenmp
 LDFLAGS += -Wl,-Bstatic
 LDFLAGS += -L$(CTF_BUILD_PATH)/lib -lctf
-LDFLAGS += -L$(SCALAPACK_PATH)/lib -lscalapack
 LDFLAGS += -Wl,-Bdynamic
+LDFLAGS += -L$(SCALAPACK_PATH)/lib -lscalapack
 
 bench: CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
 bench: LDFLAGS += -Wl,-Bstatic