diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | fb/Makefile.am | 3 | ||||
| -rw-r--r-- | mi/Makefile.am | 2 | ||||
| -rw-r--r-- | xkb/Makefile.am | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2005-07-05 Alexander Gottwald <ago@freedesktop.org> + * fb/Makefile.am: + * mi/Makefile.am: + * xkb/Makefile.am: + Revert last changes. They have to be addressed in a different way + +2005-07-05 Alexander Gottwald <ago@freedesktop.org> + * configure.ac: * hw/Makefile.am: Add XWin DDX, make Xorg DDX conditional diff --git a/fb/Makefile.am b/fb/Makefile.am index 43d5674c3..4f82f6db4 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -16,7 +16,6 @@ libfb_la_SOURCES = \ fbbstore.c \ fbcompose.c \ fbcopy.c \ - fbcmap.c \ fbfill.c \ fbfillrect.c \ fbfillsp.c \ @@ -48,3 +47,5 @@ libfb_la_SOURCES = \ fbedgeimp.h \ fbmmx.c \ fbmmx.h + +EXTRA_DIST = fbcmap.c diff --git a/mi/Makefile.am b/mi/Makefile.am index 4ee67f301..ff1fec605 100644 --- a/mi/Makefile.am +++ b/mi/Makefile.am @@ -68,6 +68,6 @@ libminimi_la_SOURCES = \ mizerclip.c \ mizerline.c -libmi_la_SOURCES = $(libminimi_la_SOURCES) miinitext.c +libmi_la_SOURCES = $(libminimi_la_SOURCES) INCLUDES = -I$(top_srcdir)/mfb diff --git a/xkb/Makefile.am b/xkb/Makefile.am index d51566734..d4142b6df 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -51,5 +51,3 @@ libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \ $(X11_SRCS) EXTRA_DIST = xkb.h xkbDflts.h - -INCLUDES = -I$(top_srcdir)/Xext/extmod |