[Gtk2hs-commit] gtk2hs ChangeLog,1.229,1.230 Makefile.am,1.1,1.2 configure.ac,1.1,1.2 aclocal.m4,1.5,NONE

[Axel S. <as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15131

Modified Files:
	ChangeLog Makefile.am configure.ac 
Removed Files:
	aclocal.m4 
Log Message:
Force automake to link object file in subdirs, not in the toplevel one.


--- aclocal.m4 DELETED ---

Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	24 Oct 2004 17:19:18 -0000	1.1
+++ configure.ac	25 Oct 2004 08:49:40 -0000	1.2
@@ -530,7 +530,6 @@
 AC_OUTPUT([
   Makefile
   gtk2hs.spec
-  mk/config.mk
   mk/chsDepend
   c2hs/toplevel/C2HSConfig.hs
 ],[chmod a+x mk/chsDepend && chmod a+x install-sh])

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	24 Oct 2004 17:19:18 -0000	1.1
+++ Makefile.am	25 Oct 2004 08:49:40 -0000	1.2
@@ -40,7 +40,6 @@
 
 lib_LIBRARIES = libgtk2hs.a
 
-
 libgtk2hs_a_SOURCES = \
 	gtk/general/Hierarchy.chs \
 	gtk/general/Signal.chs \
@@ -175,6 +174,9 @@
 	compat/LocalControl.hs \
 	compat/LocalData.hs
 
+am_libgtk2hs_a_OBJECTS = \
+  $(addsuffix .$(OBJEXT),$(basename $(libgtk2hs_a_SOURCES)))
+
 libgtk2hs_a_CHSFILES = $(filter %.chs %.chspp, $(libgtk2hs_a_SOURCES))
 libgtk2hs_a_CHSFILES_HS = $(patsubst %.chs,%.hs,\
 	$(patsubst %.chspp,%.hs,$(libgtk2hs_a_CHSFILES)))

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- ChangeLog	24 Oct 2004 17:19:18 -0000	1.229
+++ ChangeLog	25 Oct 2004 08:49:39 -0000	1.230
@@ -1,3 +1,13 @@
+2004-10-25  Axel Simon <A....@ke...>
+
+	* configure.ac: Don't update mk/config.mk.in which no longer
+	exists.
+
+	* Makefile.am: Repair automake: Force object files to be in
+	subdirectories.
+
+	* aclocal.m4: Removed. This file is regenerated automatically.
+	
 2004-10-24  Axel Simon <A....@ke...>
 
 	* configure.in, configure.ac, Makefile, Makefile.am: Removed old