Fix dependencies in Makefile.in

Author: wcawijngaards

CHANGELOG.md

@@ -10,3 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Initial release.
+
+### Fixed
+
+- Fix makefile dependencies.

Makefile.in

@@ -15,16 +15,17 @@ DEPFLAGS = -MT $@ -MMD -MP -MF $(@:.o=.d)
 srcdir = @srcdir@
 VPATH = @srcdir@
 
-SOURCES = src/zone.c src/fallback/parser.c
-
-OBJECTS = $(SOURCES:.c=.o)
-NO_OBJECTS =
-
 WESTMERE_SOURCES = src/westmere/parser.c
-WESTMERE_OBJECTS = $(WESTMERE_SOURCES:.c=.o)
+WESTMERE_OBJECTS = $($(WESTMERE)_SOURCES:.c=.o)
 
 HASWELL_SOURCES = src/haswell/parser.c
-HASWELL_OBJECTS = $(HASWELL_SOURCES:.c=.o)
+HASWELL_OBJECTS = $($(HASWELL)_SOURCES:.c=.o)
+
+SOURCES = src/zone.c src/fallback/parser.c
+OBJECTS = $(SOURCES:.c=.o) \
+          $($(WESTMERE)_SOURCES:.c=.o) \
+          $($(HASWELL)_SOURCES:.c=.o)
+DEPENDS = $(OBJECTS:.o=.d)
 
 EXPORT_HEADER = include/zone/export.h
 
@@ -33,39 +34,35 @@ EXPORT_HEADER = include/zone/export.h
 all: libzone.a
 
 clean:
+	@rm -f .depend
 	@rm -f libzone.a
-	@rm -f $(OBJECTS) $(OBJECTS:.o=.d)
-	@rm -f $(WESTMERE_OBJECTS) $(WESTMERE_OBJECTS:.o=.d)
-	@rm -f $(HASWELL_OBJECTS) $(HASWELL_OBJECTS:.o=.d)
+	@rm -f $(OBJECTS) $(WESTMERE_OBJECTS) $(HASWELL_OBJECTS)
 
 distclean: clean
 	@rm -f Makefile config.h config.log config.status
 
 realclean: distclean
 	@rm -rf autom4te*
 
-libzone.a: $(EXPORT_HEADER) $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)
-	$(AR) rcs libzone.a $(OBJECTS) $($(WESTMERE)_OBJECTS) $($(HASWELL)_OBJECTS)
-
+libzone.a: $(OBJECTS)
+	$(AR) rcs libzone.a $(OBJECTS)
 
 $(EXPORT_HEADER):
 	@mkdir -p include/zone
 	@echo "#define ZONE_EXPORT" > include/zone/export.h
 
-$(OBJECTS): $(SOURCES) $(SOURCES:.c=.d)
-	@mkdir -p src/fallback
-	$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ -c $(srcdir)/$(@:.o=.c)
+$(WESTMERE_OBJECTS): CFLAGS += -march=westmere
+$(HASWELL_OBJECTS): CFLAGS += -march=haswell
 
-$(WESTMERE_OBJECTS): $(WESTMERE_SOURCES) $(WESTMERE_SOURCES:.c=.d)
-	@mkdir -p src/westmere
-	$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=westmere -o $@ -c $(srcdir)/$(@:.o=.c)
+$(OBJECTS): .depend
+	@mkdir -p src/fallback src/westmere src/haswell
+	$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ -c $(srcdir)/$(@:.o=.c)
+	@touch $@
 
-$(HASWELL_OBJECTS): $(HASWELL_SOURCES) $(HASWELL_SOURCES:.c=.d)
-	@mkdir -p src/haswell
-	$(CC) $(DEPFLAGS) $(CPPFLAGS) $(CFLAGS) -march=haswell -o $@ -c $(srcdir)/$(@:.o=.c)
+.depend:
+	@echo -n > $@
+	@for x in $(OBJECTS:.o=); do echo $${x}.o: ${srcdir}/$${x}.c $${x}.d >> $@; done
 
-DEPENDS := $(SOURCES:.c=.d) \
-           $($(WESTMERE)_SOURCES:.c=.d) \
-           $($(HASWELL)_SOURCES:.c=.d)
+-include .depend
 $(DEPENDS):
--include $(wildcard $(DEPENDS))
+-include $(DEPENDS)