vala r2193 - in trunk: . gen-project

[juergbi svn gnome org]

Author: juergbi
Date: Tue Dec 16 22:23:56 2008
New Revision: 2193
URL: http://svn.gnome.org/viewvc/vala?rev=2193&view=rev

Log:
2008-12-16  JÃrg Billeter  <j bitron ch>

	* Makefile.am:
	* configure.ac:
	* gen-project/:

	Drop vala-gen-project, moved to vtg, Vala Toys for gedit


Removed:
   trunk/gen-project/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Dec 16 22:23:56 2008
@@ -7,12 +7,6 @@
 	$(NULL)
 endif
 
-if ENABLE_GEN_PROJECT
-GEN_PROJECT_SUBDIRS = \
-	gen-project \
-	$(NULL)
-endif
-
 SUBDIRS = \
 	gee \
 	ccode \
@@ -23,7 +17,6 @@
 	tests \
 	doc \
 	$(VAPIGEN_SUBDIRS) \
-	$(GEN_PROJECT_SUBDIRS) \
 	$(NULL)
 
 DIST_SUBDIRS = \
@@ -37,7 +30,6 @@
 	doc \
 	gobject-introspection \
 	vapigen \
-	gen-project \
 	$(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Dec 16 22:23:56 2008
@@ -30,11 +30,7 @@
 AC_ARG_ENABLE(vapigen, AS_HELP_STRING([--enable-vapigen], [Enable VAPI generator]), enable_vapigen=$enableval, enable_vapigen=no)
 AM_CONDITIONAL(ENABLE_VAPIGEN, test x$enable_vapigen = xyes)
 
-AC_ARG_ENABLE(gen-project, AS_HELP_STRING([--enable-gen-project], [Enable project generator]), enable_gen_project=$enableval, enable_gen_project=no)
-AM_CONDITIONAL(ENABLE_GEN_PROJECT, test x$enable_gen_project = xyes)
-
 GLIB_REQUIRED=2.12.0
-GTK_REQUIRED=2.10.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED)
 
@@ -51,13 +47,6 @@
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-if test x$enable_gen_project = xyes; then
-	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
-fi
-
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
 AC_PATH_PROG([XSLTPROC], [xsltproc], :)
 AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
 
@@ -75,8 +64,6 @@
            gobject-introspection/Makefile
            vapigen/Makefile
            vapigen/vala-gen-introspect/Makefile
-           vapigen/vala-gen-introspect/vala-gen-introspect
-           gen-project/Makefile
-           gen-project/licenses/Makefile])
+           vapigen/vala-gen-introspect/vala-gen-introspect])
 
 AC_OUTPUT