diff options
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | doc/Makefile.am | 16 | ||||
| -rw-r--r-- | libvala.pc.in | 6 |
4 files changed, 4 insertions, 53 deletions
diff --git a/Makefile.am b/Makefile.am index b386a112d..04dd1b0dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 NULL = -if ENABLE_VAPIGEN -VAPIGEN_SUBDIRS = \ - gobject-introspection \ - vapigen \ - $(NULL) -endif - SUBDIRS = \ gee \ ccode \ @@ -17,18 +10,6 @@ SUBDIRS = \ vapi \ tests \ doc \ - $(VAPIGEN_SUBDIRS) \ - $(NULL) - -DIST_SUBDIRS = \ - gee \ - ccode \ - vala \ - codegen \ - compiler \ - vapi \ - tests \ - doc \ gobject-introspection \ vapigen \ $(NULL) diff --git a/configure.ac b/configure.ac index 686b64bff..6025ab637 100644 --- a/configure.ac +++ b/configure.ac @@ -65,22 +65,6 @@ AC_SUBST(COVERAGE_VALAFLAGS) AC_SUBST(COVERAGE_CFLAGS) AC_SUBST(COVERAGE_LIBS) -AC_ARG_ENABLE(vapigen, AS_HELP_STRING([--disable-vapigen], [Disable VAPI generator]), enable_vapigen=$enableval, enable_vapigen=yes) -AM_CONDITIONAL(ENABLE_VAPIGEN, test x$enable_vapigen = xyes) - -if test "$enable_vapigen" = "yes"; then - vapigen_decl="vapigen=\${bindir}/vapigen${PACKAGE_SUFFIX}" - gen_introspect_decl="gen_introspect=\${libdir}/vala${PACKAGE_SUFFIX}/gen-introspect${PACKAGE_SUFFIX}" - vala_gen_introspect_decl="vala_gen_introspect=\${bindir}/vala-gen-introspect${PACKAGE_SUFFIX}" -else - vapigen_decl='' - gen_introspect_decl='' - vala_gen_introspect_decl='' -fi -AC_SUBST(vapigen_decl) -AC_SUBST(gen_introspect_decl) -AC_SUBST(vala_gen_introspect_decl) - GLIB_REQUIRED=2.18.0 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) diff --git a/doc/Makefile.am b/doc/Makefile.am index 71d979f47..58ba20594 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,19 +4,7 @@ SUBDIRS = \ vala \ $(NULL) -if ENABLE_VAPIGEN -VAPIGEN_MANS = \ - vala-gen-introspect.1 \ - vapigen.1 \ - $(NULL) -endif - -man_MANS = \ - valac.1 \ - $(VAPIGEN_MANS) \ - $(NULL) - -EXTRA_DIST = \ +dist_man_MANS = \ valac.1 \ vala-gen-introspect.1 \ vapigen.1 \ @@ -25,8 +13,6 @@ EXTRA_DIST = \ if ENABLE_UNVERSIONED install-data-hook: cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1 -if ENABLE_VAPIGEN cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1 cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1 endif -endif diff --git a/libvala.pc.in b/libvala.pc.in index 4e96afad7..ae2ab9ac8 100644 --- a/libvala.pc.in +++ b/libvala.pc.in @@ -7,9 +7,9 @@ datarootdir=@datarootdir@ datadir=@datadir@ vapidir=@datadir@/vala@PACKAGE_SUFFIX@/vapi -@vapigen_decl@ -@gen_introspect_decl@ -@vala_gen_introspect_decl@ +vapigen=@bindir@/vapigen@PACKAGE_SUFFIX@ +gen_introspect=@libdir@/vala@PACKAGE_SUFFIX@/gen-introspect@PACKAGE_SUFFIX@ +vala_gen_introspect=@bindir@/vala-gen-introspect@PACKAGE_SUFFIX@ Name: Vala Description: The Vala compiler library |