From f1ffca414c45af55e0dba8f7112a9e9452fa6b3c Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Tue, 3 Aug 1999 21:40:56 +0000 Subject: [PATCH] Cleaned it up and got rid of the redundant HP-specific SHARED_LIBRARY_LIBS stuff. --- dom/src/build/Makefile.in | 17 +--- extensions/wallet/build/Makefile.in | 29 ++----- layout/build/Makefile.in | 92 +++++++++------------ netwerk/build/Makefile.in | 66 +++++---------- rdf/brprof/build/Makefile.in | 50 +++--------- rdf/build/Makefile.in | 80 +++++++----------- rdf/chrome/build/Makefile.in | 52 ++++-------- widget/src/build/Makefile.in | 71 ++++++---------- widget/src/gtk/Makefile.in | 121 ++++++++++++---------------- xpcom/build/Makefile.in | 33 +++----- 10 files changed, 204 insertions(+), 407 deletions(-) diff --git a/dom/src/build/Makefile.in b/dom/src/build/Makefile.in index 190555ad772..e6f7ef49771 100644 --- a/dom/src/build/Makefile.in +++ b/dom/src/build/Makefile.in @@ -43,31 +43,16 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libjsdomcss_s.a \ $(NULL) -include $(topsrcdir)/config/config.mk - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else EXTRA_DSO_LDOPTS = \ $(MKSHLIB_FORCE_ALL) \ $(SHARED_LIBRARY_LIBS) \ $(MKSHLIB_UNFORCE_ALL) \ $(NULL) -endif include $(topsrcdir)/config/rules.mk CFLAGS += -D_IMPL_NS_DOM INCLUDES += -I$(srcdir)/../base -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist - -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif + diff --git a/extensions/wallet/build/Makefile.in b/extensions/wallet/build/Makefile.in index 3dc1d6d49b6..cd62d0cc3e3 100644 --- a/extensions/wallet/build/Makefile.in +++ b/extensions/wallet/build/Makefile.in @@ -24,13 +24,9 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = walletviewers MODULE = walletviewers -IS_COMPONENT = 1 +IS_COMPONENT = 1 -include $(topsrcdir)/config/config.mk - -CPPSRCS = \ - nsWalletViewerFactory.cpp \ - $(NULL) +CPPSRCS = nsWalletViewerFactory.cpp SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libcookieviewer_s.a \ @@ -39,25 +35,12 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libwalleteditor_s.a \ $(NULL) -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) -endif + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist - -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index cc00a437beb..2bc5ce38ec0 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,81 +13,62 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk +MODULE = layout +LIBRARY_NAME = raptorhtml +IS_COMPONENT = 1 -DEFINES += -D_IMPL_NS_HTML +REQUIRES = xpcom raptor dom js -LIBRARY_NAME = raptorhtml -IS_COMPONENT = 1 - -MODULE=layout - -REQUIRES=xpcom raptor dom js - -CPPSRCS = \ - nsLayoutDLF.cpp \ - nsLayoutFactory.cpp \ - $(NULL) +CPPSRCS = \ + nsLayoutDLF.cpp \ + nsLayoutFactory.cpp \ + $(NULL) ifndef MKSHLIB_FORCE_ALL -CPPSRCS += dlldeps.cpp +CPPSRCS += dlldeps.cpp endif -EXPORTS=nsLayoutCID.h +EXPORTS = nsLayoutCID.h -INCLUDES += -I$(srcdir)/../html/base/src - -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/libraptorevents_s.a \ - $(DIST)/lib/libraptorhtmlbase_s.a \ - $(DIST)/lib/libnglhtmlcon_s.a \ - $(DIST)/lib/libraptorhtmldoc_s.a \ - $(DIST)/lib/libraptorhtmlforms_s.a \ - $(DIST)/lib/libraptorhtmlstyle_s.a \ - $(DIST)/lib/libraptorhtmltable_s.a \ - $(DIST)/lib/libraptorxmlcontent_s.a \ - $(DIST)/lib/libraptorxmldoc_s.a \ - $(DIST)/lib/libraptorxulcontent_s.a \ - $(DIST)/lib/libraptorxulbase_s.a \ - $(DIST)/lib/libraptorlayout_s.a \ - $(NULL) +SHARED_LIBRARY_LIBS = \ + $(DIST)/lib/libraptorevents_s.a \ + $(DIST)/lib/libraptorhtmlbase_s.a \ + $(DIST)/lib/libnglhtmlcon_s.a \ + $(DIST)/lib/libraptorhtmldoc_s.a \ + $(DIST)/lib/libraptorhtmlforms_s.a \ + $(DIST)/lib/libraptorhtmlstyle_s.a \ + $(DIST)/lib/libraptorhtmltable_s.a \ + $(DIST)/lib/libraptorxmlcontent_s.a \ + $(DIST)/lib/libraptorxmldoc_s.a \ + $(DIST)/lib/libraptorxulcontent_s.a \ + $(DIST)/lib/libraptorxulbase_s.a \ + $(DIST)/lib/libraptorlayout_s.a \ + $(NULL) ifdef NECKO -SHARED_LIBRARY_LIBS += \ - $(DIST)/lib/libneckoutil_s.a \ - $(NULL) +SHARED_LIBRARY_LIBS += $(DIST)/lib/libneckoutil_s.a endif - - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else -EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) \ - $(NULL) -endif +EXTRA_DSO_LDOPTS = \ + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) \ + $(NULL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist +DEFINES += -D_IMPL_NS_HTML + +INCLUDES += -I$(srcdir)/../html/base/src -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif + diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 23cf80291c3..a3ee90805b3 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -1,3 +1,4 @@ +# # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in # compliance with the NPL. You may obtain a copy of the NPL at @@ -12,63 +13,38 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../.. - +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk +MODULE = necko +LIBRARY_NAME = necko +IS_COMPONENT = 1 -LIBRARY_NAME = necko -IS_COMPONENT = 1 +CPPSRCS = nsNetFactory.cpp -MODULE = necko +SHARED_LIBRARY_LIBS = \ + $(DIST)/lib/libneckobase_s.a \ + $(DIST)/lib/libneckodns_s.a \ + $(NULL) -CPPSRCS = \ - nsNetFactory.cpp \ - $(NULL) +LOCAL_INCLUDES = \ + -I$(srcdir)/../base/src \ + -I$(srcdir)/../dns/src \ + $(NULL) -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/libneckobase_s.a \ - $(DIST)/lib/libneckodns_s.a \ - $(NULL) - -LOCAL_INCLUDES += \ - -I$(srcdir)/../base/src \ - -I$(srcdir)/../dns/src \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -# hack until necko lands -ifndef NECKO -PUBLIC = $(DEPTH)/netwerk/dist/include -endif - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else -EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) \ - $(NULL) -endif +EXTRA_DSO_LDOPTS = \ + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) \ + $(NULL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist - -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif + diff --git a/rdf/brprof/build/Makefile.in b/rdf/brprof/build/Makefile.in index 419393b7187..9bc3237479c 100644 --- a/rdf/brprof/build/Makefile.in +++ b/rdf/brprof/build/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,57 +13,34 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH=../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk +MODULE = brprof +LIBRARY_NAME = brprof +IS_COMPONENT = 1 -LIBRARY_NAME = brprof -IS_COMPONENT = 1 +CPPSRCS = nsBrowsingProfileFactory.cpp -CPPSRCS = \ - nsBrowsingProfileFactory.cpp \ - $(NULL) +REQUIRES = xpcom -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +SHARED_LIBRARY_LIBS = $(DIST)/lib/libbrprof_s.a -MODULE = brprof - -REQUIRES = xpcom - -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/libbrprof_s.a \ - $(NULL) - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else -EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) -endif - -EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(NULL) +EXTRA_DSO_LDOPTS = \ + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist - -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif install:: $(TARGETS) $(INSTALL) $(srcdir)/directory.rdf $(DIST)/bin/res/samples + diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index 39fa5f9f4da..5fe7671e6cc 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,77 +13,54 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH=../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk +MODULE = rdf +LIBRARY_NAME = rdf +IS_COMPONENT = 1 -LIBRARY_NAME = rdf -IS_COMPONENT = 1 +REQUIRES = dom js netlib rdf raptor xpcom -CPPSRCS = \ - dlldeps.cpp \ - nsRDFFactory.cpp \ - $(NULL) +CPPSRCS = \ + dlldeps.cpp \ + nsRDFFactory.cpp \ + $(NULL) -EXPORTS = \ - nsRDFCID.h \ - $(NULL) - -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - -MODULE = rdf - -REQUIRES = dom js netlib rdf raptor xpcom +EXPORTS = nsRDFCID.h +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # XXX Note dependencies on implementation headers for factory functions -INCLUDES += -I$(srcdir)/../base/src \ - -I$(srcdir)/../content/src \ - -I$(srcdir)/../datasource/src \ - $(NULL) - -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/librdfbase_s.a \ - $(DIST)/lib/librdfcontent_s.a \ - $(DIST)/lib/librdfdatasource_s.a \ - $(DIST)/lib/librdfutil_s.a \ - $(NULL) +SHARED_LIBRARY_LIBS = \ + $(DIST)/lib/librdfbase_s.a \ + $(DIST)/lib/librdfcontent_s.a \ + $(DIST)/lib/librdfdatasource_s.a \ + $(DIST)/lib/librdfutil_s.a \ + $(NULL) ifdef NECKO -SHARED_LIBRARY_LIBS += \ - $(DIST)/lib/libneckoutil_s.a \ - $(NULL) +SHARED_LIBRARY_LIBS += $(DIST)/lib/libneckoutil_s.a endif -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else -EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) -endif - -EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(NULL) +EXTRA_DSO_LDOPTS = \ + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist +INCLUDES += \ + -I$(srcdir)/../base/src \ + -I$(srcdir)/../content/src \ + -I$(srcdir)/../datasource/src \ + $(NULL) -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif -install:: $(TARGETS) diff --git a/rdf/chrome/build/Makefile.in b/rdf/chrome/build/Makefile.in index 9536abf52a8..01914374616 100644 --- a/rdf/chrome/build/Makefile.in +++ b/rdf/chrome/build/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,59 +13,36 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH=../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -include $(topsrcdir)/config/config.mk +MODULE = chrome +LIBRARY_NAME = chrome +IS_COMPONENT = 1 -LIBRARY_NAME = chrome -IS_COMPONENT = 1 +REQUIRES = xpcom -CPPSRCS = \ - nsChromeFactory.cpp \ - $(NULL) +CPPSRCS = nsChromeFactory.cpp -MODULE = chrome +LOCAL_INCLUDES = -I$(srcdir)/../src -REQUIRES = xpcom +SHARED_LIBRARY_LIBS = $(DIST)/lib/libchrome_s.a -LOCAL_INCLUDES = \ - -I$(srcdir)/../src \ - $(NULL) - -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/libchrome_s.a \ - $(NULL) - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else -EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) -endif - -EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(NULL) +EXTRA_DSO_LDOPTS = \ + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist - -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif install:: $(TARGETS) $(INSTALL) $(srcdir)/registry.rdf $(DIST)/bin/chrome + diff --git a/widget/src/build/Makefile.in b/widget/src/build/Makefile.in index 9080a3ee2e7..10e1c5fb53e 100644 --- a/widget/src/build/Makefile.in +++ b/widget/src/build/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,64 +13,44 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME := widget_$(MOZ_WIDGET_TOOLKIT) +LIBRARY_NAME = widget_$(MOZ_WIDGET_TOOLKIT) -DEFINES += -D_IMPL_NS_WIDGET +CPPSRCS = nsWidgetSupport.cpp -TOOLKIT_INCLUDES := -I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) +LOCAL_INCLUDES = \ + -I$(srcdir)/../xpwidgets \ + -I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \ + -I$(srcdir)/. \ + $(NULL) -LOCAL_INCLUDES := \ - -I$(srcdir)/../xpwidgets \ - $(TOOLKIT_INCLUDES) \ - -I$(srcdir)/. \ - $(NULL) +SHARED_LIBRARY_LIBS = \ + $(addprefix $(DIST)/lib/libraptorwidget,$(addsuffix _s.a,$(MOZ_WIDGET_TOOLKIT))) \ + $(DIST)/lib/libraptorbasewidget_s.a \ + $(NULL) -CPPSRCS := \ - nsWidgetSupport.cpp \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -CXXFLAGS += $(TK_CFLAGS) - -TOOLKIT_DSO_LDOPTS = $(addprefix $(DIST)/lib/libraptorwidget, \ - $(addsuffix _s.a, $(MOZ_WIDGET_TOOLKIT))) - -SHARED_LIBRARY_LIBS = \ - $(TOOLKIT_DSO_LDOPTS) \ - $(DIST)/lib/libraptorbasewidget_s.a \ - $(NULL) - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS += -c objs/objslist -else -EXTRA_DSO_LDOPTS+= \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) \ - $(NULL) -endif - -EXTRA_DSO_LDOPTS += $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS) +EXTRA_DSO_LDOPTS = \ + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) \ + $(TOOLKIT_LIBS) \ + $(XLDFLAGS) \ + $(XLIBS) \ + $(NULL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist +CXXFLAGS += $(TK_CFLAGS) + +DEFINES += -D_IMPL_NS_WIDGET -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif + diff --git a/widget/src/gtk/Makefile.in b/widget/src/gtk/Makefile.in index 61096505260..f30def118e6 100644 --- a/widget/src/gtk/Makefile.in +++ b/widget/src/gtk/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # The contents of this file are subject to the Netscape Public License # Version 1.0 (the "NPL"); you may not use this file except in @@ -14,88 +13,70 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_gtk +LIBRARY_NAME = widget_gtk -REQUIRES=util img xpcom raptor netlib +REQUIRES = util img xpcom raptor netlib -DEFINES += -D_IMPL_NS_WIDGET +CPPSRCS = \ + nsWidgetSupport.cpp \ + nsAppShell.cpp \ + nsButton.cpp \ + nsCheckButton.cpp \ + nsClipboard.cpp \ + nsComboBox.cpp \ + nsDragService.cpp \ + nsFileWidget.cpp \ + nsFontRetrieverService.cpp \ + nsFontSizeIterator.cpp \ + nsGtkEventHandler.cpp \ + nsLabel.cpp \ + nsListBox.cpp \ + nsLookAndFeel.cpp \ + nsMenu.cpp \ + nsMenuBar.cpp \ + nsMenuItem.cpp \ + nsPopUpMenu.cpp \ + nsRadioButton.cpp \ + nsScrollbar.cpp \ + nsSound.cpp \ + nsTabWidget.cpp \ + nsTextAreaWidget.cpp \ + nsTextHelper.cpp \ + nsTextWidget.cpp \ + nsToolkit.cpp \ + nsWidget.cpp \ + nsWidgetFactory.cpp \ + nsWindow.cpp \ + $(NULL) +SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a -DEFINES += \ - -I$(srcdir)/../xpwidgets \ - -I$(srcdir)/. - -CPPSRCS = \ - nsWidgetSupport.cpp \ - nsAppShell.cpp \ - nsButton.cpp \ - nsCheckButton.cpp \ - nsClipboard.cpp \ - nsComboBox.cpp \ - nsDragService.cpp \ - nsFileWidget.cpp \ - nsFontRetrieverService.cpp \ - nsFontSizeIterator.cpp \ - nsGtkEventHandler.cpp \ - nsLabel.cpp \ - nsListBox.cpp \ - nsLookAndFeel.cpp \ - nsMenu.cpp \ - nsMenuBar.cpp \ - nsMenuItem.cpp \ - nsPopUpMenu.cpp \ - nsRadioButton.cpp \ - nsScrollbar.cpp \ - nsSound.cpp \ - nsTabWidget.cpp \ - nsTextAreaWidget.cpp \ - nsTextHelper.cpp \ - nsTextWidget.cpp \ - nsToolkit.cpp \ - nsWidget.cpp \ - nsWidgetFactory.cpp \ - nsWindow.cpp \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -CXXFLAGS += $(TK_CFLAGS) - -SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/libraptorbasewidget_s.a \ - $(NULL) - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS += -c objs/objslist -else -EXTRA_DSO_LDOPTS+= \ - $(TOOLKIT_DSO_LDOPTS) \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) \ - $(NULL) -endif - -EXTRA_DSO_LDOPTS += $(TK_LIBS) +EXTRA_DSO_LDOPTS = \ + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) \ + $(TK_LIBS) \ + $(NULL) include $(topsrcdir)/config/rules.mk -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist +CXXFLAGS += $(TK_CFLAGS) + +DEFINES += -D_IMPL_NS_WIDGET + +INCLUDES += \ + -I$(srcdir)/../xpwidgets \ + -I$(srcdir)/. \ + $(NULL) -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif + diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 2671c37766b..9aa83675768 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -43,9 +43,7 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libmozreg.a \ $(NULL) -include $(topsrcdir)/config/config.mk - -LOCAL_INCLUDES += \ +LOCAL_INCLUDES = \ -I$(srcdir)/../base \ -I$(srcdir)/../ds \ -I$(srcdir)/../io \ @@ -54,31 +52,18 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../proxy/src \ $(NULL) -DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE - -ifeq ($(OS_ARCH),HP-UX) -EXTRA_DSO_LDOPTS = -c objs/objslist -else EXTRA_DSO_LDOPTS = \ - $(MKSHLIB_FORCE_ALL) \ - $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) -endif + $(MKSHLIB_FORCE_ALL) \ + $(SHARED_LIBRARY_LIBS) \ + $(MKSHLIB_UNFORCE_ALL) + +include $(topsrcdir)/config/rules.mk + +DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE ifeq ($(OS_ARCH),BeOS) EXTRA_DSO_LDOPTS += -lbe endif -include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH),HP-UX) -shared_library_objs: $(SHARED_LIBRARY_LIBS) - rm -rf objs - mkdir objs - (cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \ - | awk '{ print "objs/"$$3 }' > objs/objslist - -$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile -else $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile -endif +