From d575a4d96dbd7ce4fc7feb01466acd288d4a27aa Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 20 Aug 2008 03:04:23 +0000
Subject: Make distcheck fixes. Fix LV2 OSC header prototypes to match code /
 remove LV2 event extension dependency.

git-svn-id: http://svn.drobilla.net/lad/ingen@1455 a436a847-0d15-0410-975c-d299462d15a1
---
 src/Makefile.am                  | 2 --
 src/common/interface/Makefile.am | 4 ++--
 src/common/lv2ext/Makefile.am    | 2 +-
 src/libs/gui/GladeFactory.cpp    | 4 ++--
 src/libs/gui/GladeFactory.hpp    | 6 +-----
 5 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index e08a97bb..200a6a75 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-EXTRA_DIST = set_dev_environment.sh
-
 SUBDIRS = libs progs bindings
 
 DIST_SUBDIRS = $(SUBDIRS) common
diff --git a/src/common/interface/Makefile.am b/src/common/interface/Makefile.am
index 37884f6b..4649fd0b 100644
--- a/src/common/interface/Makefile.am
+++ b/src/common/interface/Makefile.am
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	ClientInterface.hpp \
+	CommonInterface.hpp \
 	Connection.hpp \
 	DataType.hpp \
 	EngineInterface.hpp \
@@ -9,5 +10,4 @@ EXTRA_DIST = \
 	Patch.hpp \
 	Plugin.hpp \
 	Port.hpp \
-	README \
-	Store.hpp
+	README
diff --git a/src/common/lv2ext/Makefile.am b/src/common/lv2ext/Makefile.am
index 41f8308b..b66ffaaa 100644
--- a/src/common/lv2ext/Makefile.am
+++ b/src/common/lv2ext/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = lv2_event.h lv2_event_helpers.h
+noinst_HEADERS = lv2_event.h lv2_event_helpers.h lv2_uri_map.h
diff --git a/src/libs/gui/GladeFactory.cpp b/src/libs/gui/GladeFactory.cpp
index de23a0b7..63dc4d0b 100644
--- a/src/libs/gui/GladeFactory.cpp
+++ b/src/libs/gui/GladeFactory.cpp
@@ -18,8 +18,8 @@
 #include "GladeFactory.hpp"
 #include <iostream>
 #include <fstream>
-using std::cout; using std::cerr; using std::endl;
-using std::ifstream;
+
+using namespace std;
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/libs/gui/GladeFactory.hpp b/src/libs/gui/GladeFactory.hpp
index 0a2e88fc..6da2da5f 100644
--- a/src/libs/gui/GladeFactory.hpp
+++ b/src/libs/gui/GladeFactory.hpp
@@ -21,8 +21,6 @@
 #include <string>
 #include <libglademm/xml.h>
 
-using std::string;
-
 namespace Ingen {
 namespace GUI {
 
@@ -35,11 +33,9 @@ namespace GUI {
 class GladeFactory {
 public:
 	static Glib::RefPtr<Gnome::Glade::Xml>
-	new_glade_reference(const string& toplevel_widget = "");
+	new_glade_reference(const std::string& toplevel_widget = "");
 
 private:
-	GladeFactory() {}
-
 	static void find_glade_file();
 	static Glib::ustring glade_filename;
 };
-- 
cgit v1.2.1