From 6628abec57810468097cbc8f04601bfa3b0a23c1 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sat, 28 Apr 2001 17:26:54 +0000 Subject: [PATCH] Landing initial directory re-ordering change needed for Ron Guilmette's static mozilla work. --- Makefile.in | 2 ++ modules/plugin/default/unix/Makefile.in | 2 ++ modules/plugin/samples/default/unix/Makefile.in | 2 ++ xpfe/Makefile.in | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index ee4101417c3..1b4324da3e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,6 +160,8 @@ ifdef MOZ_STATIC_COMPONENTS DIRS += modules/staticmod endif +DIRS += xpfe/bootstrap + endif # BUILD_MODULES == all STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap diff --git a/modules/plugin/default/unix/Makefile.in b/modules/plugin/default/unix/Makefile.in index 26829cd0d30..c297e29132c 100644 --- a/modules/plugin/default/unix/Makefile.in +++ b/modules/plugin/default/unix/Makefile.in @@ -62,7 +62,9 @@ CFLAGS += $(TK_CFLAGS) endif install-plugin: $(SHARED_LIBRARY) +ifdef SHARED_LIBRARY $(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins +endif install:: install-plugin diff --git a/modules/plugin/samples/default/unix/Makefile.in b/modules/plugin/samples/default/unix/Makefile.in index 26829cd0d30..c297e29132c 100644 --- a/modules/plugin/samples/default/unix/Makefile.in +++ b/modules/plugin/samples/default/unix/Makefile.in @@ -62,7 +62,9 @@ CFLAGS += $(TK_CFLAGS) endif install-plugin: $(SHARED_LIBRARY) +ifdef SHARED_LIBRARY $(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins +endif install:: install-plugin diff --git a/xpfe/Makefile.in b/xpfe/Makefile.in index 03b0ac456c2..7e68ec316b0 100644 --- a/xpfe/Makefile.in +++ b/xpfe/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = appshell bootstrap browser communicator components global +DIRS = appshell components browser communicator global include $(topsrcdir)/config/rules.mk