diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-19 07:25:55 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-19 07:25:55 -0400 |
| commit | 97c150b61bbe436453b05d3c07cd2173870aac40 (patch) | |
| tree | 5335d0df93703e7ca8617cfae57315709d032a29 /hw/xgl/egl/Makefile.am | |
| parent | 57907e0943da0c3fd3bf6c128d210b544629ce72 (diff) | |
| parent | 547ad2125ece93bbe01f6d09a3baf176ebd16bb3 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
Diffstat (limited to 'hw/xgl/egl/Makefile.am')
| -rw-r--r-- | hw/xgl/egl/Makefile.am | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am index 5136e58b1..8c4e9af75 100644 --- a/hw/xgl/egl/Makefile.am +++ b/hw/xgl/egl/Makefile.am @@ -24,7 +24,12 @@ libxegl_la_SOURCES = \ kinput.c \ evdev.c -Xegl_DEPENDENCIES = @XEGL_LIBS@ +XEGL_LIBS = \ + @XEGL_LIBS@ \ + libxegl.la \ + ../libxgl.a \ + $XSERVER_LIBS + Xegl_LDFLAGS = -export-dynamic Xegl_SOURCES = \ xeglinit.c \ @@ -32,14 +37,8 @@ Xegl_SOURCES = \ $(top_srcdir)/Xext/dpmsstubs.c \ $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/fb/fbcmap.c -Xegl_LDADD = \ - libxegl.la \ - ../libxgl.a \ - $(XORG_CORE_LIBS) \ - $(XEGL_LIBS) \ - $(XSERVER_LIBS) \ - $(EXTENSION_LIBS) \ - $(XGLXMODULES_LIBS) -Xegl_programs = Xegl - -bin_PROGRAMS = $(Xegl_programs) + +Xegl_DEPENDENCIES = $(XEGL_LIBS) +Xegl_LDADD = $(XEGL_LIBS) $(XSERVER_SYS_LIBS) $(XEGL_SYS_LIBS) + +bin_PROGRAMS = Xegl |