[gedit/wip/non-recursive-make: 4/7] Make gedit/ non recursively



commit 7ef96037df5c532c45a1562532418bebb4cb35d6
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sun Jan 12 16:41:48 2014 +0100

    Make gedit/ non recursively

 Makefile.am       |    5 +-
 configure.ac      |    1 -
 gedit/Makefile.am |  438 +++++++++++++++++++++++++++--------------------------
 3 files changed, 227 insertions(+), 217 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a6f22d9..670f481 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd gedit po docs
+SUBDIRS = libgd po docs
 
 if !OS_OSX
 SUBDIRS += help
@@ -87,6 +87,8 @@ GSETTINGS_ENUMS_GEN = $(AM_V_GEN) $(GLIB_MKENUMS) --comments "<!-- @comment@ -->
 
 noinst_LTLIBRARIES        =
 noinst_PROGRAMS                  =
+bin_PROGRAMS              =
+pkglib_LTLIBRARIES        =
 gsettings_SCHEMAS         =
 gsettings_ENUMS           =
 dist_gsettingsschema_DATA =
@@ -102,6 +104,7 @@ include win32/Makefile.am
 include osx/Makefile.am
 include tests/Makefile.am
 include plugins/Makefile.am
+include gedit/Makefile.am
 
 override gsettings__enum_file = $(gsettings_ENUMS)
 BUILT_SOURCES += $(gsettings_ENUMS)
diff --git a/configure.ac b/configure.ac
index 8f98831..68e9181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,7 +442,6 @@ data/gedit.pc
 data/org.gnome.gedit.gschema.xml
 docs/Makefile
 docs/reference/Makefile
-gedit/Makefile
 help/Makefile
 libgd/Makefile
 plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 2679d6a..28f3e82 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -1,300 +1,308 @@
-## Process this file with automake to produce Makefile.in
-bin_PROGRAMS = gedit
+bin_PROGRAMS += gedit/gedit
 
-noinst_LTLIBRARIES = libgedit.la
+noinst_LTLIBRARIES += gedit/libgedit.la
+pkglib_LTLIBRARIES += gedit/libgedit-private.la
 
-pkglib_LTLIBRARIES = libgedit-private.la
-
-AM_CPPFLAGS =                                                          \
+gedit_common_cppflags =                                                        \
        -I$(top_srcdir)                                                 \
-       -I$(srcdir)                                                     \
+       -I$(top_srcdir)/gedit                                           \
+       -I$(top_builddir)/gedit                                         \
        -I$(top_srcdir)/libgd                                           \
+       -DDATADIR=\""$(datadir)"\"                                      \
+       -DLIBDIR=\""$(libdir)"\"
+
+gedit_common_cflags =                                                  \
        $(GEDIT_CFLAGS)                                                 \
        $(GTK_MAC_CFLAGS)                                               \
        $(WARN_CFLAGS)                                                  \
        $(DISABLE_DEPRECATED_CFLAGS)                                    \
-       $(INTROSPECTION_CFLAGS)                                         \
-       -DDATADIR=\""$(datadir)"\"                                      \
-       -DLIBDIR=\""$(libdir)"\"
+       $(INTROSPECTION_CFLAGS)
 
-gedit_SOURCES = \
-       gedit.c
+gedit_gedit_CPPFLAGS = $(gedit_common_cppflags)
+gedit_gedit_CFLAGS = $(gedit_common_cflags)
 
-gedit_LDADD =                  \
-       libgedit.la             \
-       libgedit-private.la     \
-       $(GEDIT_LIBS)           \
-       $(GTK_MAC_LIBS)         \
+gedit_gedit_LDADD =                    \
+       gedit/libgedit.la               \
+       gedit/libgedit-private.la       \
+       $(GEDIT_LIBS)                   \
+       $(GTK_MAC_LIBS)                 \
        $(INTROSPECTION_LIBS)
 
+gedit_gedit_SOURCES = gedit/gedit.c
+
 if PLATFORM_WIN32
-gedit_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libgedit.a
+gedit_gedit_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libgedit.a
 else
-gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+gedit_gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 endif
 
-libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+gedit_libgedit_la_CPPFLAGS = $(gedit_common_cppflags)
+gedit_libgedit_la_CFLAGS = $(gedit_common_cflags)
+gedit_libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 
 # GEDIT_LIBS must be the last to ensure correct order on some platforms
-libgedit_la_LIBADD =                           \
+gedit_libgedit_la_LIBADD =                     \
        $(top_builddir)/libgd/libgd.la          \
        $(GEDIT_LIBS)                           \
        $(GTK_MAC_LIBS)
 
-libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS)
-
-libgedit_private_la_LDFLAGS = -avoid-version
+gedit_libgedit_private_la_LIBADD = gedit/libgedit.la $(GEDIT_LIBS)
+gedit_libgedit_private_la_LDFLAGS = -avoid-version
+gedit_libgedit_private_la_CPPFLAGS = $(gedit_common_cppflags)
+gedit_libgedit_private_la_CFLAGS = $(gedit_common_cflags)
 
 # Mac OSX convenience library and ldflags
 if OS_OSX
-noinst_LTLIBRARIES += libosx.la
+noinst_LTLIBRARIES += gedit/libosx.la
 
-libosx_la_LDFLAGS = -framework Cocoa
-libosx_la_LIBADD = -lobjc
-libosx_la_CFLAGS = -xobjective-c
+gedit_libosx_la_LDFLAGS = -framework Cocoa
+gedit_libosx_la_LIBADD = -lobjc
+gedit_libosx_la_CPPFLAGS = $(gedit_common_cppflags)
+gedit_libosx_la_CFLAGS = -xobjective-c $(gedit_common_cflags)
 
-libosx_la_SOURCES =            \
-       gedit-app-osx.c         \
-       gedit-app-osx.h
+gedit_libosx_la_SOURCES =      \
+       gedit/gedit-app-osx.c   \
+       gedit/gedit-app-osx.h
 
-libgedit_la_LIBADD += libosx.la
+gedit_libgedit_la_LIBADD += gedit/libosx.la
 endif
 
 # Win32 convenience library and ldflags
 if OS_WIN32
-gedit_LDFLAGS += -mwindows
+gedit_gedit_LDFLAGS += -mwindows
 
-noinst_LTLIBRARIES += libwin32.la
+noinst_LTLIBRARIES += gedit/libwin32.la
 
-libwin32_la_SOURCES =          \
-       gedit-app-win32.c       \
-       gedit-app-win32.h
+gedit_libwin32_la_SOURCES =    \
+       gedit/gedit-app-win32.c \
+       gedit/gedit-app-win32.h
 
-libgedit_la_LIBADD += libwin32.la
+gedit_libwin32_la_CPPFLAGS = $(gedit_common_cppflags)
+gedit_libwin32_la_CFLAGS = $(gedit_common_cflags)
 
-gedit-res.o: gedit.rc
-       $(WINDRES) -i gedit.rc --input-format=rc -o gedit-res.o -O coff
+gedit_libgedit_la_LIBADD += gedit/libwin32.la
+gedit/gedit-res.o: gedit/gedit.rc
+       $(WINDRES) -i gedit/gedit.rc --input-format=rc -o gedit/gedit-res.o -O coff
 
-gedit_LDADD += gedit-res.o
+gedit_gedit_LDADD += gedit/gedit-res.o
 endif
 
 # X11 convenience library
 if GDK_WINDOWING_X11
-noinst_LTLIBRARIES += libx11.la
+noinst_LTLIBRARIES += gedit/libx11.la
+
+gedit_libx11_la_SOURCES =              \
+       gedit/gedit-app-x11.c           \
+       gedit/gedit-app-x11.h
 
-libx11_la_SOURCES =            \
-       gedit-app-x11.c         \
-       gedit-app-x11.h
+gedit_libx11_la_CPPFLAGS = $(gedit_common_cppflags)
+gedit_libx11_la_CFLAGS = $(gedit_common_cflags)
 
-libgedit_la_LIBADD += libx11.la
+gedit_libgedit_la_LIBADD += gedit/libx11.la
 endif
 
-BUILT_SOURCES =                        \
-       gedit-enum-types.c              \
-       gedit-enum-types.h              \
-       gedit-marshal.c                 \
-       gedit-marshal.h
-
-NOINST_H_FILES =                       \
-       gedit-cell-renderer-button.h    \
-       gedit-close-confirmation-dialog.h \
-       gedit-dirs.h                    \
-       gedit-document-input-stream.h   \
-       gedit-document-loader.h         \
-       gedit-document-output-stream.h  \
-       gedit-document-saver.h          \
-       gedit-documents-panel.h         \
-       gedit-encodings-dialog.h        \
-       gedit-file-chooser-dialog.h     \
-       gedit-highlight-mode-dialog.h   \
-       gedit-history-entry.h           \
-       gedit-io-error-info-bar.h       \
-       gedit-multi-notebook.h          \
-       gedit-notebook.h                \
-       gedit-notebook-popup-menu.h     \
-       gedit-open-menu-button.h        \
-       gedit-plugins-engine.h          \
-       gedit-preferences-dialog.h      \
-       gedit-print-job.h               \
-       gedit-print-preview.h           \
-       gedit-replace-dialog.h          \
-       gedit-settings.h                \
-       gedit-small-button.h            \
-       gedit-status-menu-button.h      \
-       gedit-tab-label.h               \
-       gedit-view-frame.h              \
-       gedit-window-private.h
-
-INST_H_FILES =                         \
-       gedit-app.h                     \
-       gedit-app-activatable.h         \
-       gedit-commands.h                \
-       gedit-debug.h                   \
-       gedit-document.h                \
-       gedit-encodings.h               \
-       gedit-encodings-combo-box.h     \
-       gedit-menu-extension.h          \
-       gedit-message-bus.h             \
-       gedit-message.h                 \
-       gedit-panel.h                   \
-       gedit-progress-info-bar.h       \
-       gedit-statusbar.h               \
-       gedit-tab.h                     \
-       gedit-utils.h                   \
-       gedit-view.h                    \
-       gedit-view-activatable.h        \
-       gedit-window.h                  \
-       gedit-window-activatable.h
+gedit_built_sources =                  \
+       gedit/gedit-enum-types.c        \
+       gedit/gedit-enum-types.h        \
+       gedit/gedit-marshal.c           \
+       gedit/gedit-marshal.h
+
+gedit_NOINST_H_FILES =                         \
+       gedit/gedit-cell-renderer-button.h      \
+       gedit/gedit-close-confirmation-dialog.h \
+       gedit/gedit-dirs.h                      \
+       gedit/gedit-document-input-stream.h     \
+       gedit/gedit-document-loader.h           \
+       gedit/gedit-document-output-stream.h    \
+       gedit/gedit-document-saver.h            \
+       gedit/gedit-documents-panel.h           \
+       gedit/gedit-encodings-dialog.h          \
+       gedit/gedit-file-chooser-dialog.h       \
+       gedit/gedit-highlight-mode-dialog.h     \
+       gedit/gedit-history-entry.h             \
+       gedit/gedit-io-error-info-bar.h         \
+       gedit/gedit-multi-notebook.h            \
+       gedit/gedit-notebook.h                  \
+       gedit/gedit-notebook-popup-menu.h       \
+       gedit/gedit-open-menu-button.h          \
+       gedit/gedit-plugins-engine.h            \
+       gedit/gedit-preferences-dialog.h        \
+       gedit/gedit-print-job.h                 \
+       gedit/gedit-print-preview.h             \
+       gedit/gedit-replace-dialog.h            \
+       gedit/gedit-settings.h                  \
+       gedit/gedit-small-button.h              \
+       gedit/gedit-status-menu-button.h        \
+       gedit/gedit-tab-label.h                 \
+       gedit/gedit-view-frame.h                \
+       gedit/gedit-window-private.h
+
+gedit_INST_H_FILES =                           \
+       gedit/gedit-app.h                       \
+       gedit/gedit-app-activatable.h           \
+       gedit/gedit-commands.h                  \
+       gedit/gedit-debug.h                     \
+       gedit/gedit-document.h                  \
+       gedit/gedit-encodings.h                 \
+       gedit/gedit-encodings-combo-box.h       \
+       gedit/gedit-menu-extension.h            \
+       gedit/gedit-message-bus.h               \
+       gedit/gedit-message.h                   \
+       gedit/gedit-panel.h                     \
+       gedit/gedit-progress-info-bar.h         \
+       gedit/gedit-statusbar.h                 \
+       gedit/gedit-tab.h                       \
+       gedit/gedit-utils.h                     \
+       gedit/gedit-view.h                      \
+       gedit/gedit-view-activatable.h          \
+       gedit/gedit-window.h                    \
+       gedit/gedit-window-activatable.h
 
 if !ENABLE_GVFS_METADATA
-INST_H_FILES += gedit-metadata-manager.h
+gedit_INST_H_FILES += gedit/gedit-metadata-manager.h
 endif
 
-headerdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gedit
-
-header_DATA =                          \
-       $(INST_H_FILES)
-
-BUILT_SOURCES_PRIVATE = \
-       gedit-resources.c
-
-libgedit_private_la_SOURCES =          \
-       gedit-app-activatable.c         \
-       gedit-view-activatable.c        \
-       gedit-window-activatable.c      \
-       gedit-menu-extension.c          \
-       gedit-resources.c
-
-libgedit_c_files =                     \
-       gedit-app.c                     \
-       gedit-cell-renderer-button.c    \
-       gedit-close-confirmation-dialog.c \
-       gedit-commands-documents.c      \
-       gedit-commands-edit.c           \
-       gedit-commands-file.c           \
-       gedit-commands-file-print.c     \
-       gedit-commands-help.c           \
-       gedit-commands-search.c         \
-       gedit-commands-view.c           \
-       gedit-debug.c                   \
-       gedit-dirs.c                    \
-       gedit-document.c                \
-       gedit-document-input-stream.c   \
-       gedit-document-loader.c         \
-       gedit-document-output-stream.c  \
-       gedit-document-saver.c          \
-       gedit-documents-panel.c         \
-       gedit-encodings.c               \
-       gedit-encodings-combo-box.c     \
-       gedit-encodings-dialog.c        \
-       gedit-file-chooser-dialog.c     \
-       gedit-highlight-mode-dialog.c   \
-       gedit-history-entry.c           \
-       gedit-io-error-info-bar.c       \
-       gedit-message-bus.c             \
-       gedit-message.c                 \
-       gedit-multi-notebook.c          \
-       gedit-notebook.c                \
-       gedit-notebook-popup-menu.c     \
-       gedit-open-menu-button.c        \
-       gedit-panel.c                   \
-       gedit-plugins-engine.c          \
-       gedit-preferences-dialog.c      \
-       gedit-print-job.c               \
-       gedit-print-preview.c           \
-       gedit-progress-info-bar.c       \
-       gedit-replace-dialog.c          \
-       gedit-settings.c                \
-       gedit-small-button.c            \
-       gedit-statusbar.c               \
-       gedit-status-menu-button.c      \
-       gedit-tab.c                     \
-       gedit-tab-label.c               \
-       gedit-utils.c                   \
-       gedit-view.c                    \
-       gedit-view-frame.c              \
-       gedit-window.c
-
-libgedit_la_SOURCES =                  \
-       $(BUILT_SOURCES)                \
-       $(libgedit_c_files)             \
-       $(NOINST_H_FILES)               \
-       $(INST_H_FILES)
+gedit_headerdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gedit
+gedit_header_HEADERS = $(gedit_INST_H_FILES)
+
+gedit_BUILT_SOURCES_PRIVATE = gedit/gedit-resources.c
+
+gedit_libgedit_private_la_SOURCES =            \
+       gedit/gedit-app-activatable.c           \
+       gedit/gedit-view-activatable.c          \
+       gedit/gedit-window-activatable.c        \
+       gedit/gedit-menu-extension.c            \
+       gedit/gedit-resources.c
+
+gedit_libgedit_c_files =                       \
+       gedit/gedit-app.c                       \
+       gedit/gedit-cell-renderer-button.c      \
+       gedit/gedit-close-confirmation-dialog.c \
+       gedit/gedit-commands-documents.c        \
+       gedit/gedit-commands-edit.c             \
+       gedit/gedit-commands-file.c             \
+       gedit/gedit-commands-file-print.c       \
+       gedit/gedit-commands-help.c             \
+       gedit/gedit-commands-search.c           \
+       gedit/gedit-commands-view.c             \
+       gedit/gedit-debug.c                     \
+       gedit/gedit-dirs.c                      \
+       gedit/gedit-document.c                  \
+       gedit/gedit-document-input-stream.c     \
+       gedit/gedit-document-loader.c           \
+       gedit/gedit-document-output-stream.c    \
+       gedit/gedit-document-saver.c            \
+       gedit/gedit-documents-panel.c           \
+       gedit/gedit-encodings.c                 \
+       gedit/gedit-encodings-combo-box.c       \
+       gedit/gedit-encodings-dialog.c          \
+       gedit/gedit-file-chooser-dialog.c       \
+       gedit/gedit-highlight-mode-dialog.c     \
+       gedit/gedit-history-entry.c             \
+       gedit/gedit-io-error-info-bar.c         \
+       gedit/gedit-message-bus.c               \
+       gedit/gedit-message.c                   \
+       gedit/gedit-multi-notebook.c            \
+       gedit/gedit-notebook.c                  \
+       gedit/gedit-notebook-popup-menu.c       \
+       gedit/gedit-open-menu-button.c          \
+       gedit/gedit-panel.c                     \
+       gedit/gedit-plugins-engine.c            \
+       gedit/gedit-preferences-dialog.c        \
+       gedit/gedit-print-job.c                 \
+       gedit/gedit-print-preview.c             \
+       gedit/gedit-progress-info-bar.c         \
+       gedit/gedit-replace-dialog.c            \
+       gedit/gedit-settings.c                  \
+       gedit/gedit-small-button.c              \
+       gedit/gedit-statusbar.c                 \
+       gedit/gedit-status-menu-button.c        \
+       gedit/gedit-tab.c                       \
+       gedit/gedit-tab-label.c                 \
+       gedit/gedit-utils.c                     \
+       gedit/gedit-view.c                      \
+       gedit/gedit-view-frame.c                \
+       gedit/gedit-window.c
+
+gedit_libgedit_la_SOURCES =            \
+       $(gedit_built_sources)          \
+       $(gedit_libgedit_c_files)       \
+       $(gedit_NOINST_H_FILES)         \
+       $(gedit_INST_H_FILES)
 
 if !ENABLE_GVFS_METADATA
-libgedit_la_SOURCES += gedit-metadata-manager.c
+gedit_libgedit_la_SOURCES += gedit/gedit-metadata-manager.c
 endif
 
-ENUM_TYPES =                   \
-       gedit-notebook.h        \
-       $(INST_H_FILES)
+gedit_ENUM_TYPES =             \
+       gedit/gedit-notebook.h  \
+       $(gedit_INST_H_FILES)
 
-gedit-enum-types.h: gedit-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS)
-       $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gedit-enum-types.h.template $(ENUM_TYPES)) > 
$@
+gedit/gedit-enum-types.h: gedit/gedit-enum-types.h.template $(gedit_ENUM_TYPES) $(GLIB_MKENUMS)
+       $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gedit/gedit-enum-types.h.template 
$(gedit_ENUM_TYPES)) > $@
 
-gedit-enum-types.c: gedit-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS)
-       $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gedit-enum-types.c.template $(ENUM_TYPES)) > 
$@
+gedit/gedit-enum-types.c: gedit/gedit-enum-types.c.template $(gedit_ENUM_TYPES) $(GLIB_MKENUMS)
+       $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gedit/gedit-enum-types.c.template 
$(gedit_ENUM_TYPES)) > $@
 
-gedit-marshal.h: gedit-marshal.list $(GLIB_GENMARSHAL)
+gedit/gedit-marshal.h: gedit/gedit-marshal.list $(GLIB_GENMARSHAL)
        $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gedit_marshal > $@
 
-gedit-marshal.c: gedit-marshal.list $(GLIB_GENMARSHAL)
+gedit/gedit-marshal.c: gedit/gedit-marshal.list $(GLIB_GENMARSHAL)
        $(AM_V_GEN) echo "#include \"gedit-marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/gedit.gresource.xml)
-gedit-resources.c: gedit.gresource.xml $(resource_files)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(srcdir)/gedit.gresource.xml
+gedit_resource_deps = $(call GRESDEPS,gedit/gedit.gresource.xml)
+gedit/gedit-resources.c: $(gedit_resource_deps)
+       $(GRESGEN)
 
 if ENABLE_PYTHON
-overridesdir = $(pyoverridesdir)
-overrides_PYTHON =                     \
-       Gedit.py
+gedit_overridesdir = $(pyoverridesdir)
+gedit_overrides_PYTHON = gedit/Gedit.py
 endif
 
-EXTRA_DIST =                           \
-       gedit-enum-types.h.template     \
-       gedit-enum-types.c.template     \
-       gedit-marshal.list              \
-       gedit.rc                        \
-       gedit.gresource.xml             \
-       $(resource_files)
+EXTRA_DIST +=                                  \
+       gedit/gedit-enum-types.h.template       \
+       gedit/gedit-enum-types.c.template       \
+       gedit/gedit-marshal.list                \
+       gedit/gedit.rc                          \
+       $(gedit_resource_deps)
 
-CLEANFILES = $(BUILT_SOURCES) $(BUILT_SOURCES_PRIVATE)
+CLEANFILES += $(gedit_BUILT_SOURCES_PRIVATE)
 
 if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS = Gedit-3.0.gir
+INTROSPECTION_GIRS = gedit/Gedit-3.0.gir
 
-Gedit-3.0.gir: gedit
+gedit/Gedit-3.0.gir: gedit/gedit
 INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) --warn-all
-Gedit_3_0_gir_NAMESPACE = Gedit
-Gedit_3_0_gir_VERSION = 3.0
-Gedit_3_0_gir_PROGRAM = $(builddir)/gedit
-Gedit_3_0_gir_FILES = $(INST_H_FILES) $(libgedit_c_files) $(BUILT_SOURCES)
-Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
 
-girdir = $(datadir)/gedit/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
+gedit_Gedit_3_0_gir_NAMESPACE = Gedit
+gedit_Gedit_3_0_gir_VERSION = 3.0
+gedit_Gedit_3_0_gir_PROGRAM = $(builddir)/gedit/gedit
+gedit_Gedit_3_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0
+gedit_Gedit_3_0_gir_FILES =            \
+       $(gedit_INST_H_FILES)           \
+       $(gedit_libgedit_c_files)       \
+       $(gedit_built_sources)
 
-typelibdir = $(libdir)/gedit/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+gedit_girdir = $(datadir)/gedit/gir-1.0
+gedit_gir_DATA = $(INTROSPECTION_GIRS)
+
+gedit_typelibdir = $(libdir)/gedit/girepository-1.0
+gedit_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES +=                  \
-       $(gir_DATA)     \
-       $(typelib_DATA)
+       $(gedit_gir_DATA)       \
+       $(gedit_typelib_DATA)
 endif
 
-dist-hook:
-       cd $(distdir); rm -f $(BUILT_SOURCES) $(BUILT_SOURCES_PRIVATE)
-
 install-exec-hook:
 if PLATFORM_WIN32
        $(mkinstalldirs) "$(DESTDIR)$(libdir)"
-       $(INSTALL_DATA) libgedit.a "$(DESTDIR)$(libdir)"
+       $(INSTALL_DATA) gedit/libgedit.a "$(DESTDIR)$(libdir)"
 else
        rm -f $(DESTDIR)$(bindir)/gnome-text-editor
        ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
 endif
 
--include $(top_srcdir)/git.mk
+BUILT_SOURCES += $(gedit_built_sources)


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