Attachment #360810 for bug #442122

Lines 31-40 Link Here

(-)mozplugger-2.1.3/configure.ac~ (-3 / +3 lines)
31	AC_PROG_MAKE_SET	31	AC_PROG_MAKE_SET
32		32
33	# Determine the linker flags for mozplugger.so	33	# Determine the linker flags for mozplugger.so
34	LDSHARED='gcc -shared'	34	LDSHARED="$CC -shared"
35	PLATFORM="x`uname`"	35	PLATFORM="x`uname`"
36	XCFLAGS="-fPIC -Wall -O2 -Wdeclaration-after-statement"	36	XCFLAGS="-fPIC"
37	BIN2O="ld -r -b binary"	37	BIN2O="$CC -nostdlib -Wl,-r -Wl,-b -Wl,binary"
38	MOZPLUGGER_SO_BLOB="mozplugger_so_blob.o"	38	MOZPLUGGER_SO_BLOB="mozplugger_so_blob.o"
39		39
40	if test "${PLATFORM}" = xIRIX; then	40	if test "${PLATFORM}" = xIRIX; then





LDSHARED=@LDSHARED@
LDFLAGS=@LDFLAGS@
CFLAGS=@CFLAGS@ $(COMMON_CFLAGS) $(XCFLAGS) @XCFLAGS@

.SUFFIXES:
.SUFFIXES: .c .o

all: mozplugger.so $(EXE_FILES)

mozplugger-helper: $(HELPER_OBJS) Makefile
	$(LD) -o $@ $(HELPER_OBJS) $(LDFLAGS) $(XLIBS)
	@$(LD) -o $@ $(HELPER_OBJS) $(LDFLAGS) $(XLIBS)

mozplugger-controller: $(CONTROL_OBJS) Makefile
	$(LD) -o $@ $(CONTROL_OBJS) $(LDFLAGS) $(XLIBS)
	@$(LD) -o $@ $(CONTROL_OBJS) $(LDFLAGS) $(XLIBS)

mozplugger-linker: $(LINKER_OBJS) Makefile
	$(LD) -o $@ $(LINKER_OBJS) $(LDFLAGS) $(XLIBS)
	@$(LD) -o $@ $(LINKER_OBJS) $(LDFLAGS) $(XLIBS)

mozplugger-update: $(MKCONFIG_OBJS) Makefile
	$(LD) -o $@ $(MKCONFIG_OBJS) $(LDFLAGS)
	@$(LD) -o $@ $(MKCONFIG_OBJS) $(LDFLAGS)

mozplugger_so_blob.o: mozplugger.so
	$(BIN2O) -o $@ $<
	@$(BIN2O) -o $@ $<

mozplugger.so: $(PLUGIN_OBJS) Makefile
	$(LDSHARED) $(LDFLAGS) -o $@ $(PLUGIN_OBJS) $(XLIBS)
	@$(LDSHARED) $(LDFLAGS) -o $@ $(PLUGIN_OBJS) $(XLIBS)

.c.o :
	$(CC) -c $(CFLAGS) -o $@ '$<'
	$(MKDEP) $(CFLAGS) -o $*.d '$<'
	-@$(MKDEP) $(CFLAGS) -o $*.d '$<'

#mozplugger-helper.o: mozplugger-helper.c cmd_flags.h child.h debug.h config.h \
#    		     pipe_msg.h Makefile

	make localinstall BROWSERDIR=.opera

install:
	-install -d $(DESTDIR)@bindir@
	install mozplugger-helper $(DESTDIR)@bindir@
	install mozplugger-controller $(DESTDIR)@bindir@
	install mozplugger-linker $(DESTDIR)@bindir@
	install mozplugger-update $(DESTDIR)@bindir@
	-install -d $(DESTDIR)@libdir@/nsbrowser/plugins
	install mozplugger.so $(DESTDIR)@libdir@/nsbrowser/plugins
	-install -d $(DESTDIR)@sysconfdir@
	install $(srcdir)/mozpluggerrc $(DESTDIR)@sysconfdir@
	-install -d $(DESTDIR)@mandir@/man7
	install $(srcdir)/mozplugger.7 $(DESTDIR)@mandir@/man7/

uninstall:
	-rm -f @sysconfdir@/mozpluggerrc

	    rm mozplugger ; \
          fi ;\
	)

-include $(ALL_OBJS:%.o=%.d)

Return to bug 442122

Lines 134-140 Link Here

(-)mozplugger-2.1.3/Makefile.in~ (-29 / +20 lines)
134		134
135	LDSHARED=@LDSHARED@	135	LDSHARED=@LDSHARED@
136	LDFLAGS=@LDFLAGS@	136	LDFLAGS=@LDFLAGS@
137	CFLAGS=$(COMMON_CFLAGS) $(XCFLAGS) @XCFLAGS@	137	CFLAGS=@CFLAGS@ $(COMMON_CFLAGS) $(XCFLAGS) @XCFLAGS@
138		138
139	.SUFFIXES:	139	.SUFFIXES:
140	.SUFFIXES: .c .o	140	.SUFFIXES: .c .o
Lines 142-174 Link Here
142	all: mozplugger.so $(EXE_FILES)	142	all: mozplugger.so $(EXE_FILES)
143		143
144	mozplugger-helper: $(HELPER_OBJS) Makefile	144	mozplugger-helper: $(HELPER_OBJS) Makefile
145	@echo "LD $@"	145	$(LD) -o $@ $(HELPER_OBJS) $(LDFLAGS) $(XLIBS)
146	@$(LD) -o $@ $(HELPER_OBJS) $(LDFLAGS) $(XLIBS)
147		146
148	mozplugger-controller: $(CONTROL_OBJS) Makefile	147	mozplugger-controller: $(CONTROL_OBJS) Makefile
149	@echo "LD $@"	148	$(LD) -o $@ $(CONTROL_OBJS) $(LDFLAGS) $(XLIBS)
150	@$(LD) -o $@ $(CONTROL_OBJS) $(LDFLAGS) $(XLIBS)
151		149
152	mozplugger-linker: $(LINKER_OBJS) Makefile	150	mozplugger-linker: $(LINKER_OBJS) Makefile
153	@echo "LD $@"	151	$(LD) -o $@ $(LINKER_OBJS) $(LDFLAGS) $(XLIBS)
154	@$(LD) -o $@ $(LINKER_OBJS) $(LDFLAGS) $(XLIBS)
155		152
156	mozplugger-update: $(MKCONFIG_OBJS) Makefile	153	mozplugger-update: $(MKCONFIG_OBJS) Makefile
157	@echo "LD $@"	154	$(LD) -o $@ $(MKCONFIG_OBJS) $(LDFLAGS)
158	@$(LD) -o $@ $(MKCONFIG_OBJS) $(LDFLAGS)
159		155
160	mozplugger_so_blob.o: mozplugger.so	156	mozplugger_so_blob.o: mozplugger.so
161	@echo "BIN2O $@"	157	$(BIN2O) -o $@ $<
162	@$(BIN2O) -o $@ $<
163		158
164	mozplugger.so: $(PLUGIN_OBJS) Makefile	159	mozplugger.so: $(PLUGIN_OBJS) Makefile
165	@echo "LD $@"	160	$(LDSHARED) $(LDFLAGS) -o $@ $(PLUGIN_OBJS) $(XLIBS)
166	@$(LDSHARED) $(LDFLAGS) -o $@ $(PLUGIN_OBJS) $(XLIBS)
167		161
168	.c.o :	162	.c.o :
169	-@echo "CC $<"	163	$(CC) -c $(CFLAGS) -o $@ '$<'
170	@$(CC) -c $(CFLAGS) -o $@ '$<'	164	$(MKDEP) $(CFLAGS) -o $*.d '$<'
171	-@$(MKDEP) $(CFLAGS) -o $*.d '$<'
172		165
173	#mozplugger-helper.o: mozplugger-helper.c cmd_flags.h child.h debug.h config.h \	166	#mozplugger-helper.o: mozplugger-helper.c cmd_flags.h child.h debug.h config.h \
174	# pipe_msg.h Makefile	167	# pipe_msg.h Makefile
Lines 266-282 Link Here
266	make localinstall BROWSERDIR=.opera	259	make localinstall BROWSERDIR=.opera
267		260
268	install:	261	install:
269	-install -d @bindir@	262	-install -d $(DESTDIR)@bindir@
270	install mozplugger-helper @bindir@	263	install mozplugger-helper $(DESTDIR)@bindir@
271	install mozplugger-controller @bindir@	264	install mozplugger-controller $(DESTDIR)@bindir@
272	install mozplugger-linker @bindir@	265	install mozplugger-linker $(DESTDIR)@bindir@
273	install mozplugger-update @bindir@	266	install mozplugger-update $(DESTDIR)@bindir@
274	-for a in ${PLUGINDIRS}; do install -d $$a ; done	267	-install -d $(DESTDIR)@libdir@/nsbrowser/plugins
275	for a in ${PLUGINDIRS}; do install mozplugger.so $$a ; done	268	install mozplugger.so $(DESTDIR)@libdir@/nsbrowser/plugins
276	-install -d @sysconfdir@	269	-install -d $(DESTDIR)@sysconfdir@
277	install $(srcdir)/mozpluggerrc @sysconfdir@	270	install $(srcdir)/mozpluggerrc $(DESTDIR)@sysconfdir@
278	-install -d @mandir@/man7	271	-install -d $(DESTDIR)@mandir@/man7
279	install $(srcdir)/mozplugger.7 @mandir@/man7/	272	install $(srcdir)/mozplugger.7 $(DESTDIR)@mandir@/man7/
280		273
281	uninstall:	274	uninstall:
282	-rm -f @sysconfdir@/mozpluggerrc	275	-rm -f @sysconfdir@/mozpluggerrc
Lines 335-339 Link Here
335	rm mozplugger ; \	328	rm mozplugger ; \
336	fi ;\	329	fi ;\
337	)	330	)
338
339	-include $(ALL_OBJS:%.o=%.d)