diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-09-20 13:45:10 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-09-20 13:50:19 +0100 |
| commit | 5f7f5902ca7479d4f880e833d5387fdc59918366 (patch) | |
| tree | dabf956d09b9cf19be9a572f19dc6a9a01d9c9b0 | |
| parent | 1f8607029082e4bd07f5d06ba1809e6506a38ee4 (diff) | |
vpath and cygwin build fixes
Fix xrx build with srcdir != builddir
Fix xrx build on cygwin by adding -no-undefined to libtool flags
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rw-r--r-- | plugin/Makefile.am | 4 | ||||
| -rw-r--r-- | xnest-plugin/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am index dbfdb61..56780bb 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -24,7 +24,7 @@ lib_LTLIBRARIES = libxrx.la RXSRC = $(top_srcdir)/rx -INCLUDES = -I$(RXSRC) +INCLUDES = -I$(RXSRC) -I$(srcdir)/include # -DPLUGIN_TRACE can be added to the following definition to debug PLUGIN_DEFINES = -DXP_UNIX -DMOZ_X11 -DOJI @@ -36,7 +36,7 @@ AM_CFLAGS = -DXP_UNIX $(CWARNFLAGS) \ $(XRX_CFLAGS) $(XRX_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS) libxrx_la_LIBADD = $(XRX_LIBS) $(XRX_PLUGIN_LIBS) -libxrx_la_LDFLAGS = -avoid-version -module +libxrx_la_LDFLAGS = -avoid-version -module -no-undefined PARAMS_SRCS = $(RXSRC)/PRead.c $(RXSRC)/PParse.c $(RXSRC)/BuildReq.c XMISC_SRCS = $(RXSRC)/XUrls.c $(RXSRC)/XAuth.c $(RXSRC)/XDpyName.c \ diff --git a/xnest-plugin/Makefile.am b/xnest-plugin/Makefile.am index 3b9fca4..b9f432d 100644 --- a/xnest-plugin/Makefile.am +++ b/xnest-plugin/Makefile.am @@ -23,7 +23,7 @@ lib_LTLIBRARIES = libxrxnest.la RXSRC = $(top_srcdir)/rx PLUGINSRC = $(top_srcdir)/plugin -INCLUDES = -I$(RXSRC) +INCLUDES = -I$(RXSRC) -I$(PLUGINSRC)/include # -DPLUGIN_TRACE can be added to the following definition to debug PLUGIN_DEFINES = -DXP_UNIX -DMOZ_X11 -DOJI @@ -49,4 +49,4 @@ libxrxnest_la_SOURCES = \ AM_CFLAGS = $(CWARNFLAGS) $(XRX_CFLAGS) $(XRX_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS) libxrxnest_la_LIBADD = $(XRX_LIBS) $(XRX_PLUGIN_LIBS) -libxrxnest_la_LDFLAGS = -avoid-version -module +libxrxnest_la_LDFLAGS = -avoid-version -module -no-undefined |