diff -Nurb aflag/Makefile aflag-new/Makefile
--- aflag/Makefile	Sat Sep 15 22:52:21 2001
+++ aflag-new/Makefile	Sun Apr  6 12:18:18 2003
@@ -1,29 +1,42 @@
-GTK_INCLUDE = `gtk-config --cflags`
-GTK_LIB = `gtk-config --libs`
+# Makefile for a gkrellm plugin
+# Copyright (C) 2001  paul cannon <paul@cannon.cs.usu.edu>
+#
+# Distributed under the GNU Public License- see COPYING
+# for details.
+#
+# You can modify this makefile for about any gkrellm plugin that
+# you're writing; just change the TARGET= line below.
+
+TARGET = aflag_anim
+
+# for aiding packaging
+DESTDIR =
+
+# This should point to your gkrellm headers
+GKRELLM_HDRS := /usr/include/gkrellm
+
+CC := gcc
+GTKFLAGS := $(shell gtk-config --cflags)
+IMLIBFLAGS := $(shell imlib-config --cflags-gdk)
+CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) $(IMLIBFLAGS) -I$(GKRELLM_HDRS)
+LDFLAGS := -shared -Wl
+INST_DIR := $(DESTDIR)/usr/lib/gkrellm/plugins
+USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm/plugins
+.PHONY: clean install
 
-IMLIB_INCLUDE = `imlib-config --cflags-gdk`
-IMLIB_LIB = `imlib-config --libs-gdk`
-THREAD_LIB = -lpthread
-INSTALLDIR = $(HOME)/.gkrellm/plugins
+all: $(TARGET).so
 
-
-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-LIBS = $(GTK_LIB) $(IMLIB_LIB) $(THREAD_LIB)
-LFLAGS = -shared
-
-CC = gcc $(CFLAGS) $(FLAGS)
-
-OBJS = aflag_anim.o
-
-earth_anim.so: $(OBJS)
-	$(CC) $(OBJS) -o aflag_anim.so $(LFLAGS) $(LIBS)
+%.so: %.o
+	$(CC) $(LDFLAGS) -o $@ $<
 
 clean:
-	rm -f *.o core *.so* *.bak *~
-
-aflag_anim.o: aflag_anim.c aflag_10.xpm
+	-rm -f $(TARGET).so $(TARGET).o
 
-# %.o: %.c
+install:
+	mkdir -p $(INST_DIR)
+	cp -f $(TARGET).so $(INST_DIR)
+
+userinstall:
+	mkdir -p $(USER_INST_DIR)
+	cp -f $(TARGET).so $(USER_INST_DIR)
 
-install: aflag_anim.so
-	install -c -s -m 644 aflag_anim.so $(INSTALLDIR)