Do more-or-less what the automake manual suggests about foreign

Sun May 15 10:24:09 2005  Soeren Sandmann  <sandmann@redhat.com>

	* Makefile.am, module/Makefile: Do more-or-less what the automake
	manual suggests about foreign subdirectories.

diff --git a/ChangeLog b/ChangeLog
index 1fa70bc..cc2bd74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 15 10:24:09 2005  Soeren Sandmann  <sandmann@redhat.com>
+
+       * Makefile.am, module/Makefile: Do more-or-less what the automake
+       manual suggests about foreign subdirectories.
+
 Sat May 14 16:36:32 2005  Søren Sandmann  <sandmann@redhat.com>
 
        * sysprof.c (set_application_title): Update the title bar on

diff --git a/Makefile.am b/Makefile.am
index afc6322..0681d10 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = module
+DIST_SUBDIRS = module
+
 bin_PROGRAMS = sysprof
 pkgdata_DATA = sysprof.glade sysprof-icon.png
 
@@ -12,7 +15,7 @@ sysprof_SOURCES =             \
        sfile.c                 \
        stackstash.h            \
        stackstash.c            \
-       sysprof-module.h        \
+       module/sysprof-module.h \
        sysprof.c               \
        treeviewutils.h         \
        treeviewutils.c         \
@@ -31,20 +34,14 @@ INCLUDES =                                     \
 
 EXTRA_DIST =                   \
        sysprof.glade           \
-       sysprof-icon.png
+       sysprof-icon.png        \
+       module/sysprof-module.c \
+       module/sysprof-module.h \
+       module/Makefile
 
 pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = sysprof-icon.png
 
-modulesdir = /lib/modules/`uname -r`/kernel/drivers
-modules_DATA = module/sysprof-module.ko
-
-CLEANFILES =                           \
-       module/sysprof-module.mod.c     \
-       module/sysprof-module.mod.h     \
-       module/sysprof-module.mod.o     \
-       module/sysprof-module.o         \
-       module/sysprof-module.ko
-
-module/sysprof-module.ko:
-       (cd module && $(MAKE))
+insert-module:
+       modprobe -r sysprof-module
+       modprobe sysprof-module

diff --git a/TODO b/TODO
index d350a55..321eefa 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,13 +10,12 @@ Before 1.0:
        - Consider expanding a few more levels of a new descendants tree 
 
 * Build system
-       - need to run depmod on install
-       - add an "install-module" target
        - Find out what distributions it actually works on
            (ask for sucess/failure-stories in 0.9.x releases)
 
 Before 1.2:
 
+- See if there is a way to make it distcheck
 - grep FIXME - not10
 - translation should be hooked up 
 - Consider adding "at least 5% inclusive cost" filter
@@ -264,6 +263,10 @@ Later:
 
 DONE:
 
+- Should do as suggested in the automake manual in the 
+  chapter "when automake is not enough"
+- add an "insert-module" target
+- need to run depmod on install
 - If the current profile has a name, display it in the title bar
 - auto*?       
 - Find out if that PREFIX business in Makefile was really such

diff --git a/module/Makefile b/module/Makefile
index 560e460..c87b078 100644 (file)
--- a/module/Makefile
+++ b/module/Makefile
@@ -31,4 +31,42 @@ endif
 $(MODULE).o: $(MODULE).c
        $(KMAKE) modules
 
+
+# Automake rules, as per "Third-Party Makefiles" in the automake manual
+
+all: $(MODULE).o
+
+distdir:
+       cp sysprof-module.c $(distdir)
+       cp sysprof-module.h $(distdir)
+       cp Makefile $(distdir)
+
+install:
+       $(KMAKE) modules_install
+       depmod
+
+install-data:
+install-exec:
+uninstall:
+
+install-info:
+installdirs:
+check:
+installcheck:
+mostlyclean:
+clean:
+       rm -f sysprof-module.ko
+       rm -f sysprof-module.o
+       rm -f sysprof-module.mod.o
+       rm -f sysprof-module.mod.c
+distclean: clean
+maintainer-clean:
+dvi:
+pdf:
+info:
+html:
+tags:
+ctags:
+
 endif
+

diff --git a/sysprof.glade b/sysprof.glade
index 2155e4b..c68756e 100644 (file)
--- a/sysprof.glade
+++ b/sysprof.glade
@@ -47,7 +47,7 @@
                      <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image68">
+                       <widget class="GtkImage" id="image80">
                          <property name="visible">True</property>
                          <property name="stock">gtk-open</property>
                          <property name="icon_size">1</property>
@@ -69,7 +69,7 @@
                      <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image69">
+                       <widget class="GtkImage" id="image81">
                          <property name="visible">True</property>
                          <property name="stock">gtk-save-as</property>
                          <property name="icon_size">1</property>
@@ -97,7 +97,7 @@
                      <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image70">
+                       <widget class="GtkImage" id="image82">
                          <property name="visible">True</property>
                          <property name="stock">gtk-quit</property>
                          <property name="icon_size">1</property>
@@ -126,12 +126,12 @@
                  <child>
                    <widget class="GtkImageMenuItem" id="start_item">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">S_tart</property>
+                     <property name="label" translatable="yes">_Start</property>
                      <property name="use_underline">True</property>
                      <signal name="activate" handler="on_start1_activate" last_modification_time="Thu, 04 Nov 2004 18:51:54 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image71">
+                       <widget class="GtkImage" id="image83">
                          <property name="visible">True</property>
                          <property name="stock">gtk-media-play</property>
                          <property name="icon_size">1</property>
@@ -152,7 +152,7 @@
                      <signal name="activate" handler="on_profile1_activate" last_modification_time="Thu, 04 Nov 2004 18:51:54 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image72">
+                       <widget class="GtkImage" id="image84">
                          <property name="visible">True</property>
                          <property name="stock">gtk-justify-left</property>
                          <property name="icon_size">1</property>
@@ -173,7 +173,7 @@
                      <signal name="activate" handler="on_reset_item_activate" last_modification_time="Fri, 05 Nov 2004 15:34:30 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image73">
+                       <widget class="GtkImage" id="image85">
                          <property name="visible">True</property>
                          <property name="stock">gtk-clear</property>
                          <property name="icon_size">1</property>
@@ -207,7 +207,7 @@
                      <signal name="activate" handler="on_about_activate" last_modification_time="Wed, 31 Dec 2003 20:44:40 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image74">
+                       <widget class="GtkImage" id="image86">
                          <property name="visible">True</property>
                          <property name="stock">gtk-about</property>
                          <property name="icon_size">1</property>