diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-04-04 11:14:21 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-04-04 11:14:21 +0100 |
| commit | e5cb26f9c594ca3112bd59e640e7aab38129284a (patch) | |
| tree | 082027dfd0e7eac7e88cd4f0f38781834af3f634 | |
| parent | 68ea1b9c6a7df9c6c1686a5569909fbd0f2541f7 (diff) | |
| parent | 06a477115151f662dfdb8e9e04a1a2a4a88b1d0c (diff) | |
Merge branch 'cygwin-patches-for-1.12' into cygwin-release-1.12xserver-cygwin-1.12.0-2
| -rw-r--r-- | hw/xwin/Makefile.am | 2 | ||||
| -rw-r--r-- | pseudoramiX/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index f56049305..31714ea2e 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -149,7 +149,7 @@ XWin_SOURCES = $(SRCS) INCLUDES = -I$(top_srcdir)/miext/rootless -XWIN_LIBS += $(top_builddir)/pseudoramix/libPseudoramiX.la +XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(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) diff --git a/pseudoramiX/Makefile.am b/pseudoramiX/Makefile.am index 4dfceb765..17b664b9e 100644 --- a/pseudoramiX/Makefile.am +++ b/pseudoramiX/Makefile.am @@ -2,6 +2,6 @@ AM_CFLAGS = $(DIX_CFLAGS) -noinst_LTLIBRARIES = libPseudoramix.la +noinst_LTLIBRARIES = libPseudoramiX.la -libPseudoramix_la_SOURCES = pseudoramiX.c pseudoramiX.h +libPseudoramiX_la_SOURCES = pseudoramiX.c pseudoramiX.h |