--- src/nomos/agent/Makefile.sa.orig	2019-04-12 08:47:43 UTC
+++ src/nomos/agent/Makefile.sa
@@ -2,10 +2,6 @@
 # This is to make a version of nomos that does not require any of the fossology build dependencies.
 # Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
 
-TOP = ../../..
-VARS = $(TOP)/Makefile.conf
-include $(VARS)
-
 EXE = nomossa
 
 SPEC = STRINGS.in
@@ -28,26 +24,26 @@ all: encode $(EXE)
 debug: nomos-gl
 
 $(EXE): nomos.o $(OBJS) $(GENOBJS)
-	$(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) $(FO_LDFLAGS) -o $(EXE)
+	$(CC) nomos.o $(OBJS) $(GENOBJS) $(LDFLAGS) $(FO_LDFLAGS) -o $(EXE)
 
-nomos.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS)
-	$(CC) -c $< $(CFLAGS_LOCAL) $(DEFS)
+nomos.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB)
+	$(CC) -c $< $(CFLAGS) $(CFLAGS_LOCAL)
 
 nomos-gl: nomos-g.o $(OBJS) $(GENOBJS)
-	$(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS_LOCAL) -o $@
+	$(CC) nomos.o $(OBJS) $(GENOBJS) $(CFLAGS) $(CFLAGS_LOCAL) -o $@
 
-nomos-g.o: nomos.c $(HDRS) $(DB) $(REPO) $(AGENTLIB) $(VARS)
-	$(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS_LOCAL)
+nomos-g.o: nomos.c $(HDRS) $(REPO) $(AGENTLIB)
+	$(CC) -c -l /usr/lib/libefence.a $< $(CFLAGS) $(CFLAGS_LOCAL)
 
-$(OBJS) $(GENOBJS): %.o: %.c $(HDRS) $(DB) $(VARS)
-	$(CC) -c $< $(CFLAGS_LOCAL)
+$(OBJS) $(GENOBJS): %.o: %.c $(HDRS)
+	$(CC) -c $< $(CFLAGS) $(CFLAGS_LOCAL)
 
 #
 # Non "standard" preprocessing stuff starts here...
 #
 
 encode: encode.o
-	$(CC) $(CFLAGS) -o $@ $@.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
 
 _precheck.c:	_autodata.c $(PRE) $(CHECK)
 #	@echo "NOTE: _autodata.c has changed --> regenerate _precheck.c"
@@ -55,7 +51,7 @@ _precheck.c:	_autodata.c $(PRE) $(CHECK)
 	./$(CHECK)
 #	@$(MAKE) $(STRINGS) $(KEYS)
 
-_autodefs.h _autodata.c:	$(SPEC) $(LICFIX)
+_autodefs.h _autodata.c:	$(SPEC) $(LICFIX) encode
 	@echo "NOTE: GENSEARCHDATA takes 1-2 minutes to run"
 	./$(LICFIX)
 
@@ -84,5 +80,3 @@ clean:
            split.OTHER checkstr.OK
 
 .PHONY: all install uninstall clean test
-
-include $(DEPS)