app/Makefile.am some Makefile fixes, more to come.

2003-07-09  Sven Neumann  <sven@gimp.org>

        * app/Makefile.am
        * app/composite/Makefile.am: some Makefile fixes, more to come.

ChangeLog

@@ -1,11 +1,16 @@
+2003-07-09  Sven Neumann  <sven@gimp.org>
+
+	* app/Makefile.am
+	* app/composite/Makefile.am: some Makefile fixes, more to come.
+
 2003-07-08  Helvetix Victorinox  <helvetix@gimp.org>
 
+	* Added app/composite for the new compositing mechanism.
+
 	* Modified configure.in to build app/composite/Makefile
 
 	* Added app/composite to app/Makefile.am
 
-	* Added app/composite for the new compositing mechanism.
-
 2003-07-08  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpdialogfactory.c: added a hack that ensures that

app/Makefile.am

@@ -6,7 +6,7 @@ endif
 
 SUBDIRS = \
 	paint-funcs	\
-	composite \
+	composite	\
 	base 		\
 	core		\
 	config		\
@@ -78,7 +78,7 @@ gimp_1_3_LDADD = \
 	file/libappfile.a						\
 	plug-in/libappplug-in.a						\
 	paint-funcs/libapppaint-funcs.a					\
-  composite/libgimpcomposite.a     \
+	composite/libappcomposite.a					\
 	base/libappbase.a						\
 	$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la	\
 	$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la	\

app/composite/Makefile.am

@@ -1,29 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libgimpcomposite.a
-
-libgimpcomposite_a_sources = \
-	gimp-composite.c \
-	gimp-composite-generic.c \
-	gimp-composite-generic.h \
-	gimp-composite.h \
-	gimp-composite-mmx.c \
-	gimp-composite-mmx.h \
-	gimp-composite-util.h
-
-libgimpcomposite_a_built_sources = gimp-composite-dispatch.c
-
-libgimpcomposite_a_SOURCES = $(libgimpcomposite_a_built_sources) $(libgimpcomposite_a_sources)
-
-INCLUDES = \
-	-I$(top_srcdir)/app	\
-	-I$(top_srcdir)/app/composite	\
-	$(GLIB_CFLAGS)		\
-	-I$(includedir)
-
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gimp-Compositing\"	\
-	@GIMP_THREAD_FLAGS@ 			\
+	@GIMP_THREAD_FLAGS@			\
 	@GIMP_MP_FLAGS@
 
 AM_CCASFLAGS = \
@@ -31,7 +10,28 @@ AM_CCASFLAGS = \
 	-I$(top_srcdir) 	\
 	-I$(top_srcdir)/app
 
-EXTRA_DIST = makefile.msc
+INCLUDES = \
+	-I$(top_srcdir)/app		\
+	-I$(top_srcdir)/app/composite	\
+	$(GLIB_CFLAGS)			\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappcomposite.a
+
+libappcomposite_a_sources = \
+	gimp-composite.c		\
+	gimp-composite-generic.c	\
+	gimp-composite-generic.h	\
+	gimp-composite.h		\
+	gimp-composite-mmx.c		\
+	gimp-composite-mmx.h		\
+	gimp-composite-util.h
+
+libappcomposite_a_built_sources = gimp-composite-dispatch.c
+
+libappcomposite_a_SOURCES = $(libappcomposite_a_built_sources) $(libappcomposite_a_sources)
+
+EXTRA_DIST = make-gimp-composite-dispatch.py
 
 gimp-composite.c: gimp-composite-dispatch.c