diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugin/Makefile.am | 20 | ||||
| -rw-r--r-- | src/Makefile.am | 30 |
4 files changed, 28 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 4569623..ab26f40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,14 +5,14 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src man plugin po data EXTRA_DIST = \ - @PACKAGE@.spec \ + $(PACKAGE).spec \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ $(NULL) DISTCLEAN_FILES = \ - @PACKAGE@.spec \ + $(PACKAGE).spec \ intltool-extract \ intltool-merge \ intltool-update \ diff --git a/configure.ac b/configure.ac index ca4ff4c..5733a69 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ VIRT_VIEWER_COMPILE_WARNINGS(maximum) GETTEXT_PACKAGE=virt-viewer AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],"$GETTEXT_PACKAGE", [GETTEXT package name]) AM_GLIB_GNU_GETTEXT IT_PROG_INTLTOOL([0.35.0]) diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 3e718bc..9c00853 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -11,20 +11,20 @@ virt_viewer_plugin_la_SOURCES = \ virt-viewer-plugin.c virt-viewer-plugin.h \ npshell.c npunix.c virt_viewer_plugin_la_LIBADD = \ - @FIREFOX_PLUGIN_LIBS@ \ - @GTK_VNC_LIBS@ \ - @GTK_LIBS@ \ - @LIBXML2_LIBS@ \ - @LIBVIRT_LIBS@ + $(FIREFOX_PLUGIN_LIBS) \ + $(GTK_VNC_LIBS) \ + $(GTK_LIBS) \ + $(LIBXML2_LIBS) \ + $(LIBVIRT_LIBS) virt_viewer_plugin_la_LDFLAGS = \ -module -avoid-version virt_viewer_plugin_la_CFLAGS = \ -DPLUGIN=1 -DENABLE_DEBUG=1 \ - @FIREFOX_PLUGIN_CFLAGS@ \ - @GTK_VNC_CFLAGS@ \ - @GTK_CFLAGS@ \ - @LIBXML2_CFLAGS@ \ - @LIBVIRT_CFLAGS@ \ + $(FIREFOX_PLUGIN_CFLAGS) \ + $(GTK_VNC_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(LIBVIRT_CFLAGS) \ -DGLADE_DIR="\"$(gladedir)\"" \ -I$(top_srcdir)/src diff --git a/src/Makefile.am b/src/Makefile.am index 0081caa..a459622 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,10 +22,10 @@ virt_viewer_SOURCES = \ $(NULL) virt_viewer_LDADD = libvirt-viewer.la virt_viewer_LDFLAGS = \ - @LIBVIRT_LIBS@ \ - @GMODULE2_LIBS@ \ + $(LIBVIRT_LIBS) \ + $(GMODULE2_LIBS) \ $(NULL) -virt_viewer_CFLAGS = $(AM_CFLAGS) @LIBVIRT_CFLAGS@ +virt_viewer_CFLAGS = $(AM_CFLAGS) $(LIBVIRT_CFLAGS) endif bin_PROGRAMS += remote-viewer @@ -35,7 +35,7 @@ remote_viewer_SOURCES = \ $(NULL) remote_viewer_LDADD = libvirt-viewer.la remote_viewer_LDFLAGS = \ - @GMODULE2_LIBS@ \ + $(GMODULE2_LIBS) \ $(NULL) libvirt_viewer_la_SOURCES = \ @@ -54,9 +54,9 @@ libvirt_viewer_la_SOURCES = \ view/ovBox.h \ $(NULL) libvirt_viewer_la_LIBADD = \ - @GMODULE2_LIBS@ \ - @GTK_LIBS@ \ - @LIBXML2_LIBS@ \ + $(GMODULE2_LIBS) \ + $(GTK_LIBS) \ + $(LIBXML2_LIBS) \ $(NULL) if HAVE_GTK_VNC @@ -64,7 +64,7 @@ libvirt_viewer_la_SOURCES += \ virt-viewer-session-vnc.h virt-viewer-session-vnc.c \ virt-viewer-display-vnc.h virt-viewer-display-vnc.c \ $(NULL) -libvirt_viewer_la_LIBADD += @GTK_VNC_LIBS@ +libvirt_viewer_la_LIBADD += $(GTK_VNC_LIBS) endif if HAVE_SPICE_GTK @@ -72,15 +72,15 @@ libvirt_viewer_la_SOURCES += \ virt-viewer-session-spice.h virt-viewer-session-spice.c \ virt-viewer-display-spice.h virt-viewer-display-spice.c \ $(NULL) -libvirt_viewer_la_LIBADD += @SPICE_GTK_LIBS@ +libvirt_viewer_la_LIBADD += $(SPICE_GTK_LIBS) endif AM_CFLAGS = \ - @GMODULE2_CFLAGS@ \ - @GTK_CFLAGS@ \ - @GTK_VNC_CFLAGS@ \ - @LIBXML2_CFLAGS@ \ - @SPICE_GTK_CFLAGS@ \ - @WARN_CFLAGS@ \ + $(GMODULE2_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GTK_VNC_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(SPICE_GTK_CFLAGS) \ + $(WARN_CFLAGS) \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ $(NULL) |