frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Jon TURNEY 2014-01-01 20:34:36 +00:00
parent aa40d0c071
commit 95357539c1
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/xwin/Makefile.am
View File

@ -15,7 +15,7 @@ if XWIN_GLX_WINDOWS
GLX_DIR = glx GLX_DIR = glx
DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS
XWIN_GLX_LIBS = $(top_builddir)/hw/xwin/glx/libXwinGLX.la XWIN_GLX_LIBS = $(top_builddir)/hw/xwin/glx/libXwinGLX.la
XWIN_GLX_LINK_FLAGS = -lopengl32 XWIN_GLX_SYS_LIBS = -lopengl32
endif endif
if XWIN_MULTIWINDOW if XWIN_MULTIWINDOW
@ -27,7 +27,7 @@ SRCS_MULTIWINDOW = \
propertystore.h \ propertystore.h \
winSetAppUserModelID.c winSetAppUserModelID.c
DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
MULTIWINDOW_LIBS = -lshlwapi -lole32 MULTIWINDOW_SYS_LIBS = -lshlwapi -lole32
endif endif
if XWIN_MULTIWINDOWEXTWM if XWIN_MULTIWINDOWEXTWM
@ -150,11 +150,28 @@ XWin_SOURCES = $(SRCS)
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
XWIN_SYS_LIBS += -ldxguid XWIN_SYS_LIBS += -ldxguid
XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la \
$(top_builddir)/Xext/libXextdpmsstubs.la \ XWIN_LIBS += \
$(top_builddir)/Xi/libXistubs.la $(top_builddir)/pseudoramiX/libPseudoramiX.la \
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS) $(top_builddir)/Xext/libXextdpmsstubs.la \
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) $(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) XWin_LDFLAGS = -mwindows -Wl,--disable-stdcall-fixup $(LD_EXPORT_SYMBOLS_FLAG)