General cleanup.

git-svn-id: svn://10.0.0.236/trunk@47697 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
briano%netscape.com
1999-09-16 01:09:42 +00:00
parent 2e896d3926
commit 41e9651666
29 changed files with 552 additions and 664 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,20 +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 src
#ifdef ENABLE_TESTS
#DIRS += tests
#endif
include $(topsrcdir)/config/config.mk
DIRS = public src
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,23 +13,23 @@
# 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 = \
nsITimer.h \
nsITimerCallback.h \
$(NULL)
MODULE = timer
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXPORTS = \
nsITimer.h \
nsITimerCallback.h \
$(NULL)
MODULE = timer
include $(topsrcdir)/config/config.mk
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,20 +13,20 @@
# 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
ifneq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
DIRS = $(MOZ_WIDGET_TOOLKIT)
DIRS = $(MOZ_WIDGET_TOOLKIT)
else
DIRS = unix
DIRS = unix
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,30 +13,25 @@
# 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 = timer_beos
MODULE = timer
LIBRARY_NAME = timer_beos
MODULE=timer
REQUIRES = xpcom
REQUIRES=xpcom
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
nsTimer.cpp \
$(NULL)
#MKSHLIB =
#override NO_SHARED_LIB=1
#override NO_STATIC_LIB=
CPPSRCS = nsTimer.cpp
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

View File

@@ -15,33 +15,29 @@
# <john_fairhurst@iname.com>. Portions created by John Fairhurst are
# Copyright (C) 1999 John Fairhurst. All Rights Reserved.
#
# Contributor(s):
# Contributor(s):
#
# Makefile for widget/timer/src/os2
DEPTH = ../../../..
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = timer_s
MODULE = timer
LIBRARY_NAME = timer_s
MODULE=timer
REQUIRES = xpcom
REQUIRES=xpcom
CPPSRCS = nsTimer.cpp
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
nsTimer.cpp \
$(NULL)
MKSHLIB =
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

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,32 +13,28 @@
# 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 = timer
LIBRARY_NAME = timer_s
LIBRARY_NAME = timer_s
REQUIRES = xpcom
MODULE=timer
CPPSRCS = nsTimer.cpp
REQUIRES=xpcom
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
nsTimer.cpp \
$(NULL)
MKSHLIB =
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

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,30 +13,28 @@
# 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 = timer_s
MODULE = timer
LIBRARY_NAME = timer_s
MODULE=timer
REQUIRES = xpcom
REQUIRES=xpcom
CPPSRCS = nsTimer.cpp
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
nsTimer.cpp \
$(NULL)
MKSHLIB =
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_TIMER
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..

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,41 +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
LIBRARY_NAME = timer_$(TIMER_SUFFIX)
REQUIRES = xpcom
CPPSRCS = nsTimerGtk.cpp
ifndef MOZ_MONOLITHIC_TOOLKIT
LIBRARY_NAME = timer_gtk
TIMER_SUFFIX = gtk
IS_COMPONENT = 1
REQUIRES = xpcom
INCLUDES += $(MOZ_GTK_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
nsTimerGtk.cpp \
nsTimerGtkFactory.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
CPPSRCS += nsTimerGtkFactory.cpp
INCLUDES += $(MOZ_GTK_CFLAGS) -I$(srcdir)/..
EXTRA_DSO_LDOPTS = $(MOZ_GTK_LDFLAGS)
else
LIBRARY_NAME = timer_s
REQUIRES = xpcom
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS = nsTimerGtk.cpp
MKSHLIB =
TIMER_SUFFIX = s
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
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,41 +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
LIBRARY_NAME = timer_$(TIMER_SUFFIX)
REQUIRES = xpcom
CPPSRCS = nsTimerMotif.cpp
ifndef MOZ_MONOLITHIC_TOOLKIT
LIBRARY_NAME = timer_motif
TIMER_SUFFIX = motif
IS_COMPONENT = 1
REQUIRES = xpcom
INCLUDES += $(MOZ_MOTIF_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
nsTimerMotif.cpp \
nsTimerMotifFactory.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_MOTIF_LDFLAGS)
CPPSRCS += nsTimerMotifFactory.cpp
INCLUDES += $(MOZ_MOTIF_CFLAGS) -I$(srcdir)/..
EXTRA_DSO_LDOPTS = $(MOZ_MOTIF_LDFLAGS)
else
LIBRARY_NAME = timer_s
REQUIRES = xpcom
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS = nsTimerMotif.cpp
MKSHLIB =
TIMER_SUFFIX = s
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
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,47 +13,42 @@
# 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
LIBRARY_NAME = timer_$(TIMER_SUFFIX)
ifndef MOZ_MONOLITHIC_TOOLKIT
REQUIRES = xpcom
LIBRARY_NAME = timer_qt
IS_COMPONENT = 1
REQUIRES = xpcom
INCLUDES += $(MOZ_QT_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
moc_nsTimerEventHandler.cpp \
nsTimerEventHandler.cpp \
nsTimerQt.cpp \
nsTimerQtFactory.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
else
LIBRARY_NAME = timer_s
REQUIRES = xpcom
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS =\
CPPSRCS = \
moc_nsTimerEventHandler.cpp \
nsTimerEventHandler.cpp \
nsTimerQt.cpp \
$(NULL)
MKSHLIB =
ifndef MOZ_MONOLITHIC_TOOLKIT
TIMER_SUFFIX = qt
IS_COMPONENT = 1
CPPSRCS += nsTimerQtFactory.cpp
INCLUDES += $(MOZ_QT_CFLAGS) -I$(srcdir)/..
EXTRA_DSO_LDOPTS = $(MOZ_QT_LDFLAGS)
else
TIMER_SUFFIX = s
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
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,41 +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
LIBRARY_NAME = timer_$(TIMER_SUFFIX)
REQUIRES = xpcom
CPPSRCS = nsTimerXlib.cpp
ifndef MOZ_MONOLITHIC_TOOLKIT
LIBRARY_NAME = timer_xlib
TIMER_SUFFIX = xlib
IS_COMPONENT = 1
REQUIRES = xpcom
INCLUDES += $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
CPPSRCS = \
nsTimerXlib.cpp \
nsTimerXlibFactory.cpp \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_XLIB_LDFLAGS)
CPPSRCS += nsTimerXlibFactory.cpp
INCLUDES += $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
EXTRA_DSO_LDOPTS = $(MOZ_XLIB_LDFLAGS)
else
LIBRARY_NAME = timer_s
REQUIRES = xpcom
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
CPPSRCS = nsTimerXlib.cpp
MKSHLIB =
TIMER_SUFFIX = s
CXXFLAGS += $(TK_CFLAGS)
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
endif # !MOZ_MONOLITHIC_TOOLKIT
endif
include $(topsrcdir)/config/rules.mk