hw/xwin: Makefile.am cleanup
- Rename XWIN_GLX_LINK_FLAGS -> XWIN_GLX_SYS_LIBS for consistency - Rename MULTIWINDOW_LIBS -> MULTIWINDOW_SYS_LIBS for consistency - Don't link with XWin with $(MAIN_LIB), it provides it's own main() - Put one library per line for more intelligible diffs when one is added Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
aa40d0c071
commit
95357539c1
|
@ -15,7 +15,7 @@ if XWIN_GLX_WINDOWS
|
|||
GLX_DIR = glx
|
||||
DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS
|
||||
XWIN_GLX_LIBS = $(top_builddir)/hw/xwin/glx/libXwinGLX.la
|
||||
XWIN_GLX_LINK_FLAGS = -lopengl32
|
||||
XWIN_GLX_SYS_LIBS = -lopengl32
|
||||
endif
|
||||
|
||||
if XWIN_MULTIWINDOW
|
||||
|
@ -27,7 +27,7 @@ SRCS_MULTIWINDOW = \
|
|||
propertystore.h \
|
||||
winSetAppUserModelID.c
|
||||
DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
|
||||
MULTIWINDOW_LIBS = -lshlwapi -lole32
|
||||
MULTIWINDOW_SYS_LIBS = -lshlwapi -lole32
|
||||
endif
|
||||
|
||||
if XWIN_MULTIWINDOWEXTWM
|
||||
|
@ -150,11 +150,28 @@ XWin_SOURCES = $(SRCS)
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
|
||||
|
||||
XWIN_SYS_LIBS += -ldxguid
|
||||
XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la \
|
||||
$(top_builddir)/Xi/libXistubs.la
|
||||
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS)
|
||||
XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
|
||||
|
||||
XWIN_LIBS += \
|
||||
$(top_builddir)/pseudoramiX/libPseudoramiX.la \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la \
|
||||
$(top_builddir)/Xi/libXistubs.la
|
||||
|
||||
XWin_DEPENDENCIES = \
|
||||
$(MULTIWINDOWEXTWM_LIBS) \
|
||||
$(XWIN_GLX_LIBS) \
|
||||
$(XWIN_LIBS) \
|
||||
$(XSERVER_LIBS)
|
||||
|
||||
XWin_LDADD = \
|
||||
$(MULTIWINDOWEXTWM_LIBS) \
|
||||
$(XWIN_GLX_LIBS) \
|
||||
$(XWIN_LIBS) \
|
||||
$(XSERVER_LIBS) \
|
||||
$(XWIN_GLX_SYS_LIBS) \
|
||||
$(XSERVER_SYS_LIBS) \
|
||||
$(XWIN_SYS_LIBS) \
|
||||
$(MULTIWINDOW_SYS_LIBS)
|
||||
|
||||
XWin_LDFLAGS = -mwindows -Wl,--disable-stdcall-fixup $(LD_EXPORT_SYMBOLS_FLAG)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue