Commit fe10884d authored by Daniel P. Berrange's avatar Daniel P. Berrange
Browse files

Remove use of @foo@ syntax from Makefile.am in favour of $(FOO)

parent 3fdf5bee
SUBDIRS = src tools examples plugin po vapi
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
pkgconfig_DATA = @PACKAGE@-$(GTK_VNC_API_VERSION).pc gvnc-1.0.pc
pkgconfig_DATA = $(PACKAGE)-$(GTK_VNC_API_VERSION).pc gvnc-1.0.pc
pkgconfigdir = $(libdir)/pkgconfig
if HAVE_PULSEAUDIO
......
......@@ -8,14 +8,14 @@ endif
gvncviewer_SOURCES = gvncviewer.c
gvncviewer_LDADD = ../src/libgtk-vnc-$(GTK_VNC_API_VERSION).la \
../src/libgvnc-1.0.la \
@GTK_CFLAGS@ \
@GTK_LIBS@ \
@VIEW_LIBS@
$(GTK_CFLAGS) \
$(GTK_LIBS) \
$(VIEW_LIBS)
if HAVE_PULSEAUDIO
gvncviewer_LDADD += ../src/libgvncpulse-1.0.la
endif
gvncviewer_CFLAGS = @GTK_CFLAGS@ @WARNING_CFLAGS@ \
@VIEW_CFLAGS@ -I$(top_srcdir)/src/
gvncviewer_CFLAGS = $(GTK_CFLAGS) $(WARNING_CFLAGS) \
$(VIEW_CFLAGS) -I$(top_srcdir)/src/
EXTRA_DIST = gvncviewer.py gvncviewer.js
......
......@@ -6,13 +6,13 @@ plugin_LTLIBRARIES = gtk-vnc-plugin.la
gtk_vnc_plugin_la_SOURCES = \
gtk-vnc-plugin.c gtk-vnc-plugin.h npshell.c npunix.c
gtk_vnc_plugin_la_LIBADD = \
../src/libgtk-vnc-1.0.la @GTK_LIBS@ \
@FIREFOX_PLUGIN_LIBS@
../src/libgtk-vnc-1.0.la $(GTK_LIBS) \
$(FIREFOX_PLUGIN_LIBS)
gtk_vnc_plugin_la_LDFLAGS = \
-module -avoid-version
gtk_vnc_plugin_la_CFLAGS = \
-I$(top_srcdir)/src @GTK_CFLAGS@ \
@FIREFOX_PLUGIN_CFLAGS@ @WARNING_CFLAGS@
-I$(top_srcdir)/src $(GTK_CFLAGS) \
$(FIREFOX_PLUGIN_CFLAGS) $(WARNING_CFLAGS)
all-local: gtk-vnc-plugin.so
......
......@@ -32,20 +32,20 @@ endif
libgvnc_1_0_la_LIBADD = \
@GOBJECT_LIBS@ \
@GIO_LIBS@ \
@GTHREAD_LIBS@ \
@GDK_PIXBUF_LIBS@ \
@GNUTLS_LIBS@ \
@SASL_LIBS@
$(GOBJECT_LIBS) \
$(GIO_LIBS) \
$(GTHREAD_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(GNUTLS_LIBS) \
$(SASL_LIBS)
libgvnc_1_0_la_CFLAGS = \
@GOBJECT_CFLAGS@ \
@GIO_CFLAGS@ \
@GTHREAD_CFLAGS@ \
@GDK_PIXBUF_CFLAGS@ \
@GNUTLS_CFLAGS@ \
@SASL_CFLAGS@ \
@WARNING_CFLAGS@ \
$(GOBJECT_CFLAGS) \
$(GIO_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
$(GNUTLS_CFLAGS) \
$(SASL_CFLAGS) \
$(WARNING_CFLAGS) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"gvnc\"
......@@ -100,13 +100,13 @@ gvncpulse_include_HEADERS = \
libgvncpulse_1_0_la_SOURCES = \
vncaudiopulse.h vncaudiopulse.c
libgvncpulse_1_0_la_LIBADD = \
@GOBJECT_LIBS@ \
@PULSEAUDIO_LIBS@ \
$(GOBJECT_LIBS) \
$(PULSEAUDIO_LIBS) \
libgvnc-1.0.la
libgvncpulse_1_0_la_CFLAGS = \
@GOBJECT_CFLAGS@ \
@PULSEAUDIO_CFLAGS@ \
@WARNING_CFLAGS@ \
$(GOBJECT_CFLAGS) \
$(PULSEAUDIO_CFLAGS) \
$(WARNING_CFLAGS) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"pulse-vnc\"
......@@ -124,13 +124,13 @@ EXTRA_DIST += continuation.h continuation.c coroutine_ucontext.c
endif
gtk_vnc_LIBADD = \
@GTK_LIBS@ \
@X11_LIBS@ \
$(GTK_LIBS) \
$(X11_LIBS) \
libgvnc-1.0.la
gtk_vnc_CFLAGS = \
@GTK_CFLAGS@ \
@X11_CFLAGS@ \
@WARNING_CFLAGS@ \
$(GTK_CFLAGS) \
$(X11_CFLAGS) \
$(WARNING_CFLAGS) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"gtk-vnc\"
......@@ -291,9 +291,9 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES)
if WITH_PYTHON
pyexec_LTLIBRARIES = gtkvnc.la
gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la @PYGTK_LIBS@
gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \
@PYGTK_CFLAGS@ @WARNING_PYTHON_CFLAGS@
gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la $(PYGTK_LIBS)
gtkvnc_la_CFLAGS = $(GTK_CFLAGS) $(PYTHON_INCLUDES) \
$(PYGTK_CFLAGS) $(WARNING_PYTHON_CFLAGS)
gtkvnc_la_LDFLAGS = -module -avoid-version -fPIC
gtkvnc_la_SOURCES = vncmodule.c
nodist_gtkvnc_la_SOURCES = vncmodule.defs.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment