vala r952 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat Feb  2 13:56:50 2008
New Revision: 952
URL: http://svn.gnome.org/viewvc/vala?rev=952&view=rev

Log:
2008-02-02  Juerg Billeter  <j bitron ch>

	* vala/valasourcefile.vala: remove basedir workaround used for
	  backward compatibility, so that --library without --basedir
	  works as expected


Modified:
   trunk/ChangeLog
   trunk/vala/valasourcefile.vala

Modified: trunk/vala/valasourcefile.vala
==============================================================================
--- trunk/vala/valasourcefile.vala	(original)
+++ trunk/vala/valasourcefile.vala	Sat Feb  2 13:56:50 2008
@@ -1,6 +1,6 @@
 /* valasourcefile.vala
  *
- * Copyright (C) 2006-2007  JÃrg Billeter
+ * Copyright (C) 2006-2008  JÃrg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -207,12 +207,7 @@
 		if (cinclude_filename == null) {
 			var basename = filename.ndup ((uint) (filename.len () - ".vala".len ()));
 			basename = Path.get_basename (basename);
-			if (context.basedir == null && context.library != null) {
-				// backward-compatibility
-				cinclude_filename = "%s/%s.h".printf (context.library, basename);
-			} else {
-				cinclude_filename = "%s%s.h".printf (get_subdir (), basename);
-			}
+			cinclude_filename = "%s%s.h".printf (get_subdir (), basename);
 		}
 		return cinclude_filename;
 	}