General cleanup.

This commit is contained in:
briano%netscape.com 1999-09-10 00:37:14 +00:00
parent 5debc7e092
commit 0e85815036
5 changed files with 36 additions and 56 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,15 +13,16 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../..
DEPTH = ../..
topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = include src
DIRS = include 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,33 +13,27 @@
# 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
MODULE = npsimple
LIBRARY_NAME = npsimple
IS_COMPONENT = 1
MODULE = npsimple
LIBRARY_NAME = npsimple
IS_COMPONENT = 1
LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
CPPSRCS = npsimple.cpp
CPPSRCS = \
npsimple.cpp \
$(NULL)
include $(topsrcdir)/config/config.mk
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
include $(topsrcdir)/config/rules.mk
EXPORT_RESOURCE_SAMPLES := \
$(srcdir)/samples/embed-test.html \
$(NULL)
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
install::
$(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples
install::
$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples

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,6 +13,7 @@
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#
DEPTH = ../../..
topsrcdir = @top_srcdir@
@ -25,27 +25,22 @@ include $(DEPTH)/config/autoconf.mk
MODULE = plugimpl
LIBRARY_NAME = plug
REQUIRES = lay layer js style applet img util java pref xpcom raptor netcnvts plugin plugimpl oji ojiimpl caps
CSRCS = npassoc.c
CPPSRCS = nsplugin.cpp npglue.cpp nsMalloc.cpp
EXPORTS = nppg.h npglue.h nppriv.h nsMalloc.h
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
REQUIRES = lay layer js style applet img util java pref xpcom raptor netcnvts plugin plugimpl oji ojiimpl caps
ifeq ($(subst /,_,$(shell uname -s)),OS2)
CPPSRCS = npwplat.cpp
REQUIRES += xp libfont os2font jtools
endif
include $(topsrcdir)/config/rules.mk
ifeq ($(subst /,_,$(shell uname -s)),OS2)
CPPSRCS = npwplat.cpp
REQUIRES += xp libfont os2font jtools
INCLUDES += -I$(DEPTH)/cmd/os2fe/nfc/include -I$(DEPTH)/cmd/os2fe -I$(DEPTH)/cmd/winfe
endif
INCLUDES += -I$(srcdir)/.
$(LIBRARY): $(OBJS)

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,33 +13,27 @@
# 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
MODULE = npsimple
LIBRARY_NAME = npsimple
IS_COMPONENT = 1
MODULE = npsimple
LIBRARY_NAME = npsimple
IS_COMPONENT = 1
LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
CPPSRCS = npsimple.cpp
CPPSRCS = \
npsimple.cpp \
$(NULL)
include $(topsrcdir)/config/config.mk
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
include $(topsrcdir)/config/rules.mk
EXPORT_RESOURCE_SAMPLES := \
$(srcdir)/samples/embed-test.html \
$(NULL)
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
install::
$(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples
install::
$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples

View File

@ -1,5 +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
@ -17,13 +15,14 @@
# Reserved.
#
DEPTH = ../..
DEPTH = ../..
topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = src
DIRS = src
include $(topsrcdir)/config/rules.mk