[aravis] viewer: don't add a version suffix.



commit 9c9dde349136e9d8117bf49474a7199fe99a99a9
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Wed Aug 8 10:29:09 2012 +0200

    viewer: don't add a version suffix.
    
    It doesn't really make sense, and was broken (ui files were not versionned).

 viewer/.gitignore  |    2 +-
 viewer/Makefile.am |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/viewer/.gitignore b/viewer/.gitignore
index f1d72a1..c0e04c2 100644
--- a/viewer/.gitignore
+++ b/viewer/.gitignore
@@ -1 +1 @@
-arv-viewer-*.*
+arv-viewer
diff --git a/viewer/Makefile.am b/viewer/Makefile.am
index 2b83b49..cadf2d3 100644
--- a/viewer/Makefile.am
+++ b/viewer/Makefile.am
@@ -12,18 +12,18 @@ INCLUDES = \
 
 AM_CFLAGS = -Wall -lm
 
-bin_PROGRAMS = arv-viewer- ARAVIS_API_VERSION@
+bin_PROGRAMS = arv-viewer
 
-arv_viewer_ ARAVIS_API_VERSION@_SOURCES = arvviewer.c	\
+arv_viewer_SOURCES = arvviewer.c	\
 		     arvfeaturewidget.c \
 		     arvfeaturewidget.h
 
-arv_viewer_ ARAVIS_API_VERSION@_LDADD = $(ARAVIS_VIEWER_LIBS) $(top_builddir)/src/libaravis- ARAVIS_API_VERSION@.la
-arv_viewer_ ARAVIS_API_VERSION@dir = $(aravis_datadir)
+arv_viewer_LDADD = $(ARAVIS_VIEWER_LIBS) $(top_builddir)/src/libaravis- ARAVIS_API_VERSION@.la
+arv_viewerdir = $(aravis_datadir)
 if ARAVIS_WITH_GTK3
-arv_viewer_ ARAVIS_API_VERSION@_DATA = arv-viewer-3.ui
+arv_viewer_DATA = arv-viewer-3.ui
 else
-arv_viewer_ ARAVIS_API_VERSION@_DATA = arv-viewer-2.ui
+arv_viewer_DATA = arv-viewer-2.ui
 endif
 
 EXTRA_DIST += arv-viewer-2.ui arv-viewer-3.ui



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]