summaryrefslogtreecommitdiff
path: root/build_shared
diff options
context:
space:
mode:
authorCedric Gustin <cgustin@ibelgique.com>2003-03-14 22:46:08 +0000
committerMurray Cumming <murrayc@src.gnome.org>2003-03-14 22:46:08 +0000
commita380e957c44c2d7999677ed51baf2b9656920f31 (patch)
treea7d27e833e74db0808120cea5c79679137648528 /build_shared
parent09ddcf26ef99245252675752410b113235c80e3f (diff)
downloadglibmm-a380e957c44c2d7999677ed51baf2b9656920f31.tar.gz
Removed libstdc++ in LDFLAGS on win32. Latest libtool is taking care of
2003-03-04 Cedric Gustin <cgustin@ibelgique.com> * configure.in : Removed libstdc++ in LDFLAGS on win32. Latest libtool is taking care of it. * build_shared/Makefile_build.am_fragment, tools/extra_defs_gen/Makefile.am : Added --export-all-symbols linker flag on win32 (required by latest libtool to build DLLs). * build_shared/Makefile_gensrc.am_fragment : Modifiy rule that builds wrap_init.cc. wrap_init.cc now contains reference to all objects, event on win32. #ifdefs are included when needed. * README.win32 : updated for version 2.2. Added list of missing methods and signals on win32 * tools/m4/base.m4 : Added _GTKMMPROC_SIGNAL_H_AND_CC macro.
Diffstat (limited to 'build_shared')
-rw-r--r--build_shared/Makefile_build.am_fragment21
-rw-r--r--build_shared/Makefile_gensrc.am_fragment4
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))