Fix Makefile clean targets

Since we have a list of objects that we build already, use that in the
clean targets instead of *.o.  This fixes the config-ui Makefile clean
target, which was potentially missing ../configfile.plugin.o.

diff --git a/Makefile b/Makefile
index d608e3c..a5c6924 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,6 @@ install: all
        install -c -m 0644 microb.desktop $(DESTDIR)$(PREFIX)/share/applications/hildon
 
 clean:
        install -c -m 0644 microb.desktop $(DESTDIR)$(PREFIX)/share/applications/hildon
 
 clean:

-       rm -f $(APP) *.o dbus-server-glue.h
+       rm -f $(APP) $(obj) dbus-server-glue.h

 
 .PHONY: strip install diablo fremantle
 
 .PHONY: strip install diablo fremantle

diff --git a/config-ui/Makefile b/config-ui/Makefile
index c0c13b4..e5ec80b 100644 (file)
--- a/config-ui/Makefile
+++ b/config-ui/Makefile
@@ -68,6 +68,6 @@ install-plugin: plugin
        install -c -m 0644 $(APP).desktop $(DESTDIR)$(PREFIX)/share/applications/hildon-control-panel
 
 clean:
        install -c -m 0644 $(APP).desktop $(DESTDIR)$(PREFIX)/share/applications/hildon-control-panel
 
 clean:

-       rm -f $(APP) $(HILDON_APP) $(PLUGIN) *.o ../configfile.o
+       rm -f $(APP) $(HILDON_APP) $(PLUGIN) $(app_obj) $(happ_obj) $(plugin_obj)

 
 .PHONY: strip strip-plugin install install-plugin app diablo-hildon-app diablo-plugin fremantle-hildon-app fremantle-plugin
 
 .PHONY: strip strip-plugin install install-plugin app diablo-hildon-app diablo-plugin fremantle-hildon-app fremantle-plugin