diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2013-02-21 18:14:26 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2013-04-12 21:21:15 +0200 |
| commit | 0fd9a6185be58e359f208193d669163de21f8164 (patch) | |
| tree | 9e2650f683e57a9fa8c6c6b8fc821e0221100b88 /src/Makefile.am | |
| parent | 584f6cf5a59408caad96d51c209cdeae0defb15d (diff) | |
| download | virt-viewer-0fd9a6185be58e359f208193d669163de21f8164.tar.gz virt-viewer-0fd9a6185be58e359f208193d669163de21f8164.tar.xz virt-viewer-0fd9a6185be58e359f208193d669163de21f8164.zip | |
build-sys: Simplify setting of optional CFLAGS/LDFLAGS
They don't need to be wrapped inside if HAVE_XXX blocks in Makefile.am
as when XXX is not available, XXX_CFLAGS and XXX_LIBS will expand to
the empty string, and thus we can carry them unconditionally in
our app_CFLAGS/app_LDFLAGS variables.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 62cc606..12f71f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -80,31 +80,25 @@ virt_viewer_LDFLAGS = \ -lm \ $(GLIB2_LIBS) \ $(GTK_LIBS) \ + $(GTK_VNC_LIBS) \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ + $(OVIRT_LIBS) \ + $(SPICE_GTK_LIBS) \ $(NULL) virt_viewer_CFLAGS = \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -DG_LOG_DOMAIN=\"virt-viewer\" \ $(GLIB2_CFLAGS) \ $(GTK_CFLAGS) \ + $(GTK_VNC_CFLAGS) \ $(LIBXML2_CFLAGS) \ $(LIBVIRT_CFLAGS) \ + $(OVIRT_CFLAGS) \ + $(SPICE_GTK_CFLAGS) \ + $(SPICE_CONTROLLER_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) - -if HAVE_GTK_VNC -virt_viewer_LDFLAGS += $(GTK_VNC_LIBS) -virt_viewer_CFLAGS += $(GTK_VNC_CFLAGS) -endif -if HAVE_OVIRT -virt_viewer_LDFLAGS += $(OVIRT_LIBS) -virt_viewer_CFLAGS += $(OVIRT_CFLAGS) -endif -if HAVE_SPICE_GTK -virt_viewer_LDFLAGS += $(SPICE_GTK_LIBS) -virt_viewer_CFLAGS += $(SPICE_GTK_CFLAGS) -endif endif @@ -118,29 +112,25 @@ remote_viewer_LDFLAGS = \ -lm \ $(GLIB2_LIBS) \ $(GTK_LIBS) \ + $(GTK_VNC_LIBS) \ $(LIBXML2_LIBS) \ + $(OVIRT_LIBS) \ + $(SPICE_GTK_LIBS) \ + $(SPICE_CONTROLLER_LIBS) \ $(NULL) remote_viewer_CFLAGS = \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -DG_LOG_DOMAIN=\"remote-viewer\" \ $(GLIB2_CFLAGS) \ $(GTK_CFLAGS) \ + $(GTK_VNC_CFLAGS) \ $(LIBXML2_CFLAGS) \ + $(OVIRT_CFLAGS) \ + $(SPICE_GTK_CFLAGS) \ + $(SPICE_CONTROLLER_CFLAGS) \ $(WARN_CFLAGS) \ $(NULL) -if HAVE_GTK_VNC -remote_viewer_LDFLAGS += $(GTK_VNC_LIBS) -remote_viewer_CFLAGS += $(GTK_VNC_CFLAGS) -endif -if HAVE_OVIRT -remote_viewer_LDFLAGS += $(OVIRT_LIBS) -remote_viewer_CFLAGS += $(OVIRT_CFLAGS) -endif -if HAVE_SPICE_GTK -remote_viewer_LDFLAGS += $(SPICE_GTK_LIBS) $(SPICE_CONTROLLER_LIBS) -remote_viewer_CFLAGS += $(SPICE_GTK_CFLAGS) $(SPICE_CONTROLLER_CFLAGS) -endif if OS_WIN32 remote_viewer_LDFLAGS += -Wl,--subsystem,windows endif |