[PATCH 2/6] Make the DPMS, ScreenSaver and Res extensions builtin

[Peter Hutterer]

On Wed, Aug 04, 2010 at 12:12:00PM +0200, Tomas Carnecky wrote:
> On 8/4/10 3:39 AM, Peter Hutterer wrote:
> > On Sun, Aug 01, 2010 at 09:28:19PM +0200, Tomas Carnecky wrote:
> >> The change is trivial: simply move the ExtensionModule definitions from
> >> hw/xfree/dixmods/extmod/modinit.c to mi/miinitext.c. Then also make sure
> >> the required sources for those extensions are built into libXextbuiltin.la
> >> instead of libXextmodule.la.
> > 
> > looks good in principle, but
> > make[4]: Entering directory `/home/whot/xorg/xserver/build-i686/hw/xfree86'
> >   CCLD   libxorg.la
> > copying selected object files to avoid basename conflicts...
> >   CCLD   Xorg
> > ./.libs/libxorg.a(libdixmods_la-miinitext.o):(.data.rel+0x1ec): undefined reference to `DPMSExtensionInit'
> > ./.libs/libxorg.a(libdixmods_la-miinitext.o):(.data.rel+0x200): undefined reference to `ScreenSaverExtensionInit'
> > ./.libs/libxorg.a(libdixmods_la-miinitext.o):(.data.rel+0x214): undefined reference to `ResExtensionInit'
> > collect2: ld returned 1 exit status
> 
> You need to at least `make clean -C Xext`, the dpms sources moved from
> libXextmodule.la to libXextbuiltin.la but autotools doesn't
> automatically rebuild those libraries. I usually use git clean -dfx and
> then rebuild the whole thing from scratch. Even if it takes *ages* on my
> hardware, at least then I can be sure that it builds.

yes, you're right, I'm sorry about the false alarm here. Builds fine now.
minor nitpick, there are two spaces in the makefile.am hunks for screensaver
and res. Feel free to fix this up or not.

+BUILTIN_SRCS  += $(SCREENSAVER_SRCS)

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
  Peter