1 files changed, 20 insertions, 63 deletions
diff --git a/generate/unix/acpibin/Makefile b/generate/unix/acpibin/Makefile
index 4779cb8fe27b0..57648d99faf34 100644
--- a/generate/unix/acpibin/Makefile
+++ b/generate/unix/acpibin/Makefile
@@ -14,13 +14,18 @@ include ../Makefile.config
 PROG = acpibin
 
 #
-# Flags specific to acpibin
+# Search paths for source files
 #
-CFLAGS+= \
-    -DACPI_BIN_APP \
-    -I$(ACPICA_TOOLS)/acpibin
+vpath %.c \
+    $(ACPIBIN) \
+    $(ACPICA_UTILITIES) \
+    $(ACPICA_COMMON) \
+    $(ACPICA_OSL)
 
-OBJS = \
+HEADERS = \
+    $(wildcard $(ACPIBIN)/*.h)
+
+OBJECTS = \
     abcompare.o \
     abmain.o \
 	utalloc.o \
@@ -38,72 +43,24 @@ OBJS = \
     getopt.o
 
 #
-# Root rule
-#
-$(PROG) : $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
-	$(COPYPROG)
-
-#
-# acpibin source
-#
-abcompare.o :       $(ACPICA_TOOLS)/acpibin/abcompare.c
-	$(COMPILE)
-
-abmain.o :          $(ACPICA_TOOLS)/acpibin/abmain.c
-	$(COMPILE)
-
-#
-# ACPICA core source - common
+# Flags specific to acpibin
 #
-getopt.o :          $(ACPICA_COMMON)/getopt.c
-	$(COMPILE)
+CFLAGS+= \
+    -DACPI_BIN_APP \
+    -I$(ACPIBIN)
 
 #
-# ACPICA core source
+# Rules
 #
-utalloc.o :         $(ACPICA_CORE)/utilities/utalloc.c
-	$(COMPILE)
-
-utcache.o :         $(ACPICA_CORE)/utilities/utcache.c
-	$(COMPILE)
-
-utdebug.o :         $(ACPICA_CORE)/utilities/utdebug.c
-	$(COMPILE)
-
-utdecode.o :        $(ACPICA_CORE)/utilities/utdecode.c
-	$(COMPILE)
-
-utglobal.o :        $(ACPICA_CORE)/utilities/utglobal.c
-	$(COMPILE)
-
-utlock.o :          $(ACPICA_CORE)/utilities/utlock.c
-	$(COMPILE)
-
-utmath.o :          $(ACPICA_CORE)/utilities/utmath.c
-	$(COMPILE)
-
-utmisc.o :          $(ACPICA_CORE)/utilities/utmisc.c
-	$(COMPILE)
-
-utmutex.o :         $(ACPICA_CORE)/utilities/utmutex.c
-	$(COMPILE)
-
-utstate.o :         $(ACPICA_CORE)/utilities/utstate.c
-	$(COMPILE)
-
-utxferror.o :       $(ACPICA_CORE)/utilities/utxferror.c
-	$(COMPILE)
+$(PROG) : $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
+	$(COPYPROG)
 
-#
-# Unix OS services layer (OSL)
-#
-osunixxf.o :        $(ACPICA_OSL)/osunixxf.c
+%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
 	$(COMPILE)
 
-
 clean :
-	rm -f $(PROG) $(PROG).exe $(OBJS)
+	rm -f $(PROG) $(PROG).exe $(OBJECTS)
 
 install :
 	$(INSTALLPROG)