diff options
Diffstat (limited to 'build_shared')
-rw-r--r-- | build_shared/Makefile_build.am_fragment | 21 | ||||
-rw-r--r-- | build_shared/Makefile_gensrc.am_fragment | 4 |
2 files changed, 3 insertions, 22 deletions
diff --git a/build_shared/Makefile_build.am_fragment b/build_shared/Makefile_build.am_fragment index 12245ffb..8bac39cd 100644 --- a/build_shared/Makefile_build.am_fragment +++ b/build_shared/Makefile_build.am_fragment @@ -36,7 +36,7 @@ no_undefined = win32_dlls_extra_libs = endif -common_ldflags = -version-info $(LIBGLIBMM_SO_VERSION) $(no_undefined) $(LIBSTDCPP_LIBS) +common_ldflags = -version-info $(LIBGLIBMM_SO_VERSION) $(no_undefined) all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \ -I$(top_builddir)/pango -I$(top_srcdir)/pango \ @@ -74,22 +74,3 @@ endif maintainer-clean-local: (cd $(srcdir) && rm -f $(files_built_all_cc) $(files_built_all_h)) -if OS_WIN32 -libtool_import_libs = $(lib_LTLIBRARIES:.la=.dll.a) -install-libtool-import-lib: - @for import_lib in $(libtool_import_libs); do \ - $(INSTALL) .libs/$$import_lib $(DESTDIR)$(libdir); \ - done -uninstall-libtool-import-lib: - @for import_lib in $(libtool_import_libs); do \ - -rm $(DESTDIR)$(libdir)/$$import_lib; \ - done -else -install-libtool-import-lib: -uninstall-libtool-import-lib: -endif - -install-data-local: install-libtool-import-lib - -uninstall-local: uninstall-libtool-import-lib - diff --git a/build_shared/Makefile_gensrc.am_fragment b/build_shared/Makefile_gensrc.am_fragment index ad19275d..be2d4c8b 100644 --- a/build_shared/Makefile_gensrc.am_fragment +++ b/build_shared/Makefile_gensrc.am_fragment @@ -45,8 +45,8 @@ $(stamp_dir)/stamp-%: %.hg %.ccg $(gmmproc_in) $(tools_m4) $(tools_pm) $(files_d $(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir) @echo 'timestamp' >$@ -$(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_in) $(files_hg) - $(run_gen_wrap_init) $(files_hg:%.hg=$(srcdir)/%.hg) >$@ +$(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_in) $(files_all_hg) + $(run_gen_wrap_init) $(files_all_hg:%.hg=$(srcdir)/%.hg) >$@ create-stamp-dir: @(test -d $(stamp_dir) || mkdir $(stamp_dir)) |