Sync'd various Makefile.ins to their Makefile counterparts.
Removed nspr & nspr20 from REQUIRES. Removed NSPR_LDFLAGS. Changed LIBNSPR refs to NSPR_LIBS. Removed leftover NSPR20 ifdefs. git-svn-id: svn://10.0.0.236/trunk@13233 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = xml
|
||||
LIBRARY_NAME = $(LITE_PREFIX)xml
|
||||
|
||||
REQUIRES = nspr img layer util js
|
||||
REQUIRES = img layer util js
|
||||
EXPORTS = $(srcdir)/expat/xmlparse/xmlparse.h
|
||||
|
||||
CSRCS = expat/xmltok/xmltok.c \
|
||||
|
||||
@@ -21,7 +21,7 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
REQUIRES = xmlparse xmltok expat js xmljs nspr
|
||||
REQUIRES = xmlparse xmltok expat js xmljs
|
||||
CSRCS = js.c \
|
||||
$(NULL)
|
||||
|
||||
@@ -30,7 +30,7 @@ PROGRAM = xmljs
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
CFLAGS += -DJSFILE -I$(srcdir)/.
|
||||
|
||||
MYLIBS = -lxmljs -lexpat -lxmltok -ljs $(LIBNSPR) -ldl -lm
|
||||
MYLIBS = -lxmljs -lexpat -lxmltok -ljs $(NSPR_LIBS) -ldl -lm
|
||||
|
||||
js:
|
||||
rm -f $(PROGRAM)
|
||||
|
||||
Reference in New Issue
Block a user