General cleanup.

This commit is contained in:
briano%netscape.com 1999-09-09 02:14:10 +00:00
parent c858c8cd9c
commit b660ad4475
8 changed files with 67 additions and 72 deletions

View File

@ -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,8 +13,9 @@
# 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@
@ -27,9 +27,10 @@ include $(topsrcdir)/config/config.mk
# Rhapsody is using a copy of the viewer source
# as a starting point for the ybfe.
ifeq ($(OS_ARCH),Rhapsody)
DIRS = $(DEPTH)/cmd/ybfe
DIRS = $(DEPTH)/cmd/ybfe
else
DIRS = viewer
DIRS = viewer
endif
include $(topsrcdir)/config/rules.mk

View File

@ -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,19 +13,21 @@
# 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
EXPORTS = \
nsIXPBaseWindow.h \
nsIWindowListener.h \
$(NULL)
EXPORTS = \
nsIXPBaseWindow.h \
nsIWindowListener.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk

View File

@ -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,34 +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
ifndef MOZ_MONOLITHIC_TOOLKIT
ifdef MOZ_MONOLITHIC_TOOLKIT
DIRS = $(MOZ_WIDGET_TOOLKIT)
else
DIRS =
ifdef MOZ_ENABLE_GTK
DIRS += gtk
DIRS += gtk
endif
ifdef MOZ_ENABLE_MOTIF
DIRS += motif
DIRS += motif
endif
ifdef MOZ_ENABLE_XLIB
DIRS += xlib
endif
ifdef MOZ_ENABLE_QT
DIRS += qt
DIRS += qt
endif
ifdef MOZ_ENABLE_XLIB
DIRS += xlib
endif
else
DIRS = $(MOZ_WIDGET_TOOLKIT)
endif # !MOZ_MONOLITHIC_TOOLKIT
endif
include $(topsrcdir)/config/rules.mk

View File

@ -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,8 +13,9 @@
# 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@
@ -24,21 +24,20 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = viewer_gtk_s
CPPSRCS = \
nsGtkMain.cpp \
nsGtkMenu.cpp \
$(NULL)
CPPSRCS = \
nsGtkMain.cpp \
nsGtkMenu.cpp \
$(NULL)
MKSHLIB =
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/../..
INCLUDES += -I$(srcdir)/../..
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_GTK_CFLAGS)
CXXFLAGS += $(MOZ_GTK_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
endif

View File

@ -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,8 +13,9 @@
# 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@
@ -24,21 +24,20 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = viewer_motif_s
CPPSRCS = \
nsMotifMain.cpp \
nsMotifMenu.cpp \
$(NULL)
CPPSRCS = \
nsMotifMain.cpp \
nsMotifMenu.cpp \
$(NULL)
MKSHLIB =
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/../..
INCLUDES += -I$(srcdir)/../..
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_MOTIF_CFLAGS)
CXXFLAGS += $(MOZ_MOTIF_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
endif

View File

@ -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,8 +13,9 @@
# 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@
@ -24,23 +24,21 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = viewer_qt_s
CPPSRCS = \
nsQtMain.cpp \
nsQtMenu.cpp \
moc_nsQtMenu.cpp \
$(NULL)
CPPSRCS = \
nsQtMain.cpp \
nsQtMenu.cpp \
moc_nsQtMenu.cpp \
$(NULL)
MKSHLIB =
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/../..
INCLUDES += -I$(srcdir)/../..
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_QT_CFLAGS)
CXXFLAGS += $(MOZ_QT_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
endif

View File

@ -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,8 +13,9 @@
# 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@
@ -24,20 +24,19 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = viewer_xlib_s
CPPSRCS = \
nsXlibMain.cpp \
$(NULL)
CPPSRCS = \
nsXlibMain.cpp \
$(NULL)
MKSHLIB =
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/../..
INCLUDES += -I$(srcdir)/../..
ifndef MOZ_MONOLITHIC_TOOLKIT
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
CXXFLAGS += $(MOZ_XLIB_CFLAGS)
else
CXXFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
endif

View File

@ -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,16 +13,16 @@
# 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
DIRS= public timer src
include $(topsrcdir)/config/config.mk
DIRS = public timer src
include $(topsrcdir)/config/rules.mk