From 7a8af94b1fdc8ce2efa07f2a54d943c8ddfc8149 Mon Sep 17 00:00:00 2001
From: Efi Fogel <efif@post.tau.ac.il>
Date: Sun, 11 Feb 2007 17:15:52 +0000
Subject: [PATCH] cleanup generic rules

---
 .../src/CGALQt/kds.makefile                   | 17 +++-------
 .../src/CGALQt/kds_deps.makefile              | 34 ++++++++++++-------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Kinetic_data_structures/src/CGALQt/kds.makefile b/Kinetic_data_structures/src/CGALQt/kds.makefile
index f9a5bbbed32..454fec227ff 100644
--- a/Kinetic_data_structures/src/CGALQt/kds.makefile
+++ b/Kinetic_data_structures/src/CGALQt/kds.makefile
@@ -20,18 +20,11 @@
 #
 # Author(s)     : Daniel Russel
 
-
 CGAL_KDS_OBJECTS = \
-Kinetic_pixmaps$(OBJ_EXT)\
-Kinetic_Qt_widget_2_core$(OBJ_EXT)\
-Kinetic_Qt_core$(OBJ_EXT)\
-Kinetic_Qt_timer$(OBJ_EXT)\
+Kinetic_pixmaps$(OBJ_EXT) \
+Kinetic_Qt_widget_2_core$(OBJ_EXT) \
+Kinetic_Qt_core$(OBJ_EXT) \
+Kinetic_Qt_timer$(OBJ_EXT) \
 Kinetic_Qt_window_2$(OBJ_EXT)
 
-#KDS_Qt_examiner_viewer$(OBJ_EXT)\
-
-
-KDS_MOC_FILES = \
-Kinetic_Qt_core.moc Kinetic_Qt_timer.moc Kinetic_Qt_window_2.moc Kinetic_Qt_widget_2_core.moc
-
-#KDS_Qt_examiner_viewer.moc
+#KDS_Qt_examiner_viewer$(OBJ_EXT)
diff --git a/Kinetic_data_structures/src/CGALQt/kds_deps.makefile b/Kinetic_data_structures/src/CGALQt/kds_deps.makefile
index 7da207c0278..ecce588661c 100644
--- a/Kinetic_data_structures/src/CGALQt/kds_deps.makefile
+++ b/Kinetic_data_structures/src/CGALQt/kds_deps.makefile
@@ -20,6 +20,17 @@
 #
 # Author(s)     : Daniel Russel
 
+#---------------------------------------------------------------------#
+#                    specific rules for kds
+#---------------------------------------------------------------------#
+
+vpath %.h $(CGAL_INCL_DIR)/CGAL/Kinetic/IO/internal
+
+#---------------------------------------------------------------------#
+#                    moc rules
+#---------------------------------------------------------------------#
+
+#KDS_Qt_examiner_viewer$(OBJ_EXT) : KDS_Qt_examiner_viewer.moc
 
 Kinetic_Qt_widget_2_core$(OBJ_EXT): Kinetic_Qt_widget_2_core.moc
 
@@ -31,20 +42,17 @@ Kinetic_Qt_window_2$(OBJ_EXT): Kinetic_Qt_window_2.moc
 
 Kinetic_pixmaps$(OBJ_EXT): Kinetic_*.xpm
 
-#CGAL_KDS_INCL_DIR := $(CGAL_INCL_DIR)/CGAL/Kinetic/IO/internal
+# It would be nice the *.moc file base name is identical to the *.h.
+# In this case the following rules can be removed all together.
 
+Kinetic_Qt_core.moc: Qt_core.h
+	$(QT_MOC) $< -o $@
 
-Kinetic_Qt_core.moc: ../../include/CGAL/Kinetic/IO/internal/Qt_core.h
-	$(QT_MOC) ../../include/CGAL/Kinetic/IO/internal/Qt_core.h -o Kinetic_Qt_core.moc
+Kinetic_Qt_timer.moc: Qt_timer.h
+	$(QT_MOC) $< -o $@
 
+Kinetic_Qt_widget_2_core.moc: Qt_widget_2_core.h
+	$(QT_MOC) $< -o $@
 
-Kinetic_Qt_timer.moc: ../../include/CGAL/Kinetic/IO/internal/Qt_timer.h
-	$(QT_MOC) ../../include/CGAL/Kinetic/IO/internal/Qt_timer.h -o Kinetic_Qt_timer.moc
-
-
-Kinetic_Qt_widget_2_core.moc: ../../include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h
-	$(QT_MOC) ../../include/CGAL/Kinetic/IO/internal/Qt_widget_2_core.h -o Kinetic_Qt_widget_2_core.moc
-
-
-Kinetic_Qt_window_2.moc: ../../include/CGAL/Kinetic/IO/internal/Qt_window_2.h
-	$(QT_MOC)  ../../include/CGAL/Kinetic/IO/internal/Qt_window_2.h -o Kinetic_Qt_window_2.moc
+Kinetic_Qt_window_2.moc: Qt_window_2.h
+	$(QT_MOC) $< -o $@