4 files changed, 33 insertions, 16 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 673f508fa..2b5a7eeb2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,5 @@
-EXTRA_DIST = xine.h.in
+SUBDIRS = xine
+#EXTRA_DIST = xine.h.in
 
 if GENERATED_INTTYPES_H
 inttypes_h = inttypes.h
@@ -8,15 +9,7 @@ include_HEADERS = xine.h
 
 noinst_HEADERS = config.h configure.h
 
-CONFIG_CLEAN_FILES = xine.h $(inttypes_h)
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#* 
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in configure.h.in
+CONFIG_CLEAN_FILES = $(inttypes_h)
 
 install-data-local: install-includeHEADERS
 	sed -e '/^\/\*_x_/d' xine.h > $(DESTDIR)$(includedir)/xine.h
diff --git a/include/xine.h.in b/include/xine.h
index 5a06eab65..4eaccf96c 100644
--- a/include/xine.h.in
+++ b/include/xine.h
@@ -62,6 +62,7 @@ extern "C" {
 #include <xine/os_types.h>
 #include <xine/attributes.h>
 #endif
+#include <xine/version.h>
 
 /* This enables some experimental features. These are not part of the
  * official libxine API, so use them only, if you absolutely need them.
@@ -103,12 +104,6 @@ void xine_get_version (int *major, int *minor, int *sub) XINE_PROTECTED;
    return 1 if compatible, 0 otherwise */
 int  xine_check_version (int major, int minor, int sub) XINE_PROTECTED;
 
-/* static info - which libxine release this header came from */
-#define XINE_MAJOR_VERSION @XINE_MAJOR@
-#define XINE_MINOR_VERSION @XINE_MINOR@
-#define XINE_SUB_VERSION   @XINE_SUB@
-#define XINE_VERSION       "@VERSION@"
-
 /*
  * pre-init the xine engine
  *
diff --git a/include/xine/Makefile.am b/include/xine/Makefile.am
new file mode 100644
index 000000000..f143d83c4
--- /dev/null
+++ b/include/xine/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = version.h.in
+
+xineincludedir = $(includedir)/xine
+xineinclude_HEADERS = version.h
diff --git a/include/xine/version.h.in b/include/xine/version.h.in
new file mode 100644
index 000000000..75072708d
--- /dev/null
+++ b/include/xine/version.h.in
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2007 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ */
+
+/* static info - which libxine release this header came from */
+#define XINE_MAJOR_VERSION @XINE_MAJOR@
+#define XINE_MINOR_VERSION @XINE_MINOR@
+#define XINE_SUB_VERSION   @XINE_SUB@
+#define XINE_VERSION       "@VERSION@"