Commit dfb33700 authored by kipp%netscape.com's avatar kipp%netscape.com
Browse files

Cleaned up linkage of the viewer

parent 96926732

webshell/tests/viewer/Makefile.in

+70 −62
Original line number Diff line number Diff line
@@ -84,10 +84,19 @@ ifdef MOZ_OJI 
	JSJ_LIB = -ljsj

endif



LIBS = \

BASE_LIBS =	     \

	-lraptorbase \

	-lpref	     \

	-lraptorbase \

	$(ZLIB_LIBS) \

	-lreg	     \

	-ljs	     \

	-lxpcom	     \

	-lsecfree    \

	-lmozutil    \

	$(NULL)



GECKO_LIBS =		      \

	-lraptorwebwidget     \

	$(TOOLKIT_WIDGET_LIB) \

	-lraptorgfx	      \

	$(TOOLKIT_GFX_LIB)    \
@@ -95,44 +104,43 @@ LIBS = \ 
	$(TOOLKIT_BASE_LIB)   \

	-lraptorhtmlpars      \

	-lraptorview	      \

	-lreg \

	-ljsdom		      \

	-lraptorplugin	      \

	$(NULL)



IMGLIB_LIBS =	     \

	-limg	     \

	$(JPEG_LIBS) \

	$(PNG_LIBS)  \

	$(NULL)



NETLIB_LIBS =	      \

	-labouturl    \

	-lfileurl     \

	-lftpurl      \

	-lgophurl     \

	-lhttpurl     \

	-lremoturl    \

	-lsockstuburl \

	-limg \

	$(JPEG_LIBS) \

	$(PNG_LIBS) \

	-ljs \

	-ljsdom \

	-ljsurl \

	$(JSJ_LIB) \

	-lmimetype    \

	-lnetcache    \

	-lnetcnvts    \

	-lnetlib      \

	-lnetutil     \

	-lnetwork     \

	$(NSPR_LIBS) \

	-lpwcac \

	-lraptorwebwidget \

	-lreg \

	-lremoturl \

	-lsecfree \

	-lstubnj \

	-lstubsj \

	-ltestdynamic \

	-lmozutil \

	-lxp \

	-lxpcom \

	-lmozutil \

	-lxp	      \

	-lxpcom \

	$(ZLIB_LIBS) \

	-lraptorplugin \

	-ljsurl	      \

	-lmozdbm      \

	-lpwcac	      \

	$(NULL)



LIBS =		       \

	$(GECKO_LIBS)  \

	$(NETLIB_LIBS) \

	$(IMGLIB_LIBS) \

	$(BASE_LIBS)   \

	$(JSJ_LIB)     \

	$(NSPR_LIBS)   \

	$(TK_LIBS)     \

	$(NULL)
@@ -142,6 +150,6 @@ CFLAGS += $(TOOLKIT_CFLAGS) 


include $(topsrcdir)/config/rules.mk



install::

install:: $(PROGRAM)

	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples

	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber