[gjs] Remove some leftover cruft from external native modules



commit ce589d4d27b75d39f1848e942314493742b6d755
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed May 22 16:07:32 2013 -0400

    Remove some leftover cruft from external native modules
    
    https://bugzilla.gnome.org/show_bug.cgi?id=700862

 Makefile.am             |    3 ---
 configure.ac            |    2 --
 gjs-internals-1.0.pc.in |    1 -
 gjs/importer.c          |    3 ---
 4 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0a73883..20f7ee7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ lib_LTLIBRARIES =
 noinst_HEADERS =
 noinst_LTLIBRARIES =
 dist_gjsjs_DATA =
-gjsnative_LTLIBRARIES =
 BUILT_SOURCES =
 CLEANFILES =
 EXTRA_DIST =
@@ -22,7 +21,6 @@ AM_CFLAGS = $(WARN_CFLAGS) -DG_LOG_DOMAIN=\"Gjs\"
 gjsjsdir = @gjsjsdir@
 gjsoverridedir = $(gjsjsdir)/overrides
 gjstweenerdir = $(gjsjsdir)/tweener
-gjsnativedir = @gjsnativedir@
 
 gjs_public_includedir = $(includedir)/gjs-1.0
 gjs_module_includedir = $(includedir)/gjs-1.0
@@ -81,7 +79,6 @@ EXTRA_DIST +=                         \
 gjs_directory_defines =                                \
        -DGJS_TOP_SRCDIR=\"$(top_srcdir)\"              \
        -DGJS_JS_DIR=\"$(gjsjsdir)\"                    \
-       -DGJS_NATIVE_DIR=\"$(gjsnativedir)\"            \
        -DPKGLIBDIR=\"$(pkglibdir)\"
 
 ########################################################################
diff --git a/configure.ac b/configure.ac
index dee8439..b9c7123 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,9 +230,7 @@ fi
 AC_SUBST(EXTRA_LINK_FLAGS)
 
 gjsjsdir="\${datadir}/gjs-1.0"
-gjsnativedir="\${libdir}/gjs-1.0"
 AC_SUBST([gjsjsdir])
-AC_SUBST([gjsnativedir])
 
 dnl automake 1.11/1.12 defines this but does not substitute it
 AC_SUBST([pkglibexecdir], ["${libexecdir}/${PACKAGE}"])
diff --git a/gjs-internals-1.0.pc.in b/gjs-internals-1.0.pc.in
index 7d92cff..b6c8d4a 100644
--- a/gjs-internals-1.0.pc.in
+++ b/gjs-internals-1.0.pc.in
@@ -7,7 +7,6 @@ datarootdir= datarootdir@
 datadir= datadir@
 
 jsdir= gjsjsdir@
-jsnativedir= gjsnativedir@
 
 Cflags: -I${includedir}/gjs-1.0
 Requires: gjs-1.0 gobject-introspection-1.0 mozjs-17.0
diff --git a/gjs/importer.c b/gjs/importer.c
index 6fa0723..b5245cc 100644
--- a/gjs/importer.c
+++ b/gjs/importer.c
@@ -1109,9 +1109,6 @@ gjs_get_search_path(void)
             g_ptr_array_add(path, s);
         }
 
-        /* ${libdir}/gjs-1.0 */
-        g_ptr_array_add(path, g_strdup(GJS_NATIVE_DIR));
-
         /* ${datadir}/share/gjs-1.0 */
         g_ptr_array_add(path, g_strdup(GJS_JS_DIR));
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]