mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Removed full relative include path for l10n headers. Added -I$(DEPTH)/l10n/us to INCLUDES. Removed $(NSPR_LIBS) from *_DEPLIBS.

This commit is contained in:
cls%seawood.org 1998-10-02 18:26:20 +00:00
Родитель f670f192a8
Коммит b3d2cdc97d
2 изменённых файлов: 26 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

28
cmd/gnomefe/Makefile.in
Просмотреть файл

@ -191,7 +191,7 @@ endif
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/. $(GNOME_CFLAGS)
INCLUDES += -I$(srcdir)/. -I$(DEPTH)/l10n/us $(GNOME_CFLAGS)
DEFINES += -DNEW_DECODERS -DGNOME_FE
@ -412,14 +412,14 @@ endif
BASIC_LIBS += $(DIST)/lib/libhtmldlgs.a $(DIST)/lib/libsecfree.a
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
EXPORT_DEPLIBS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2)
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
FRANCE_DEPLIBS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
FRANCE_DEPLIBS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2)
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(OTHER_LIBS) $(NSPR_LIBS)
US_DEPLIBS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS)
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
US_DEPLIBS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2)
DSO_EX_LIBS = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
DSO_EX_LIBS = $(FRANCE_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
@ -591,9 +591,9 @@ ifeq ($(OS_ARCH),OSF1)
OTHER_LIBS = -ldnet_stubs -lm -lots $(OS_LIBS)
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(OTHER_LIBS)
EXPORT_LDFLAGS = $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
FRANCE_LDFLAGS = $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
US_LDFLAGS = $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) $(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
ifdef MOZ_EDITOR
#
@ -714,13 +714,13 @@ endif
US_LDFLAGS = -z defs -L$(USRLIBDIR) \
-R$(USRLIBDIR) $(BASIC_LIBS) $(US_LIB) $(BASIC_LIBS_2) \
$(OTHER_LIBS) $(NSPR_LIBS)
$(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
EXPORT_LDFLAGS = -z defs -L$(USRLIBDIR) \
-R$(USRLIBDIR) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) \
$(OTHER_LIBS) $(NSPR_LIBS)
$(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
FRANCE_LDFLAGS = -z defs -L$(USRLIBDIR) \
-R$(USRLIBDIR) $(BASIC_LIBS) $(FRANCE_LIB) $(BASIC_LIBS_2) \
$(OTHER_LIBS) $(NSPR_LIBS)
$(NSPR_LDFLAGS) $(NSPR_LIBS) $(OTHER_LIBS)
endif
@ -1215,7 +1215,7 @@ pure: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.pure
quantify: $(OBJDIR)/$(XFE_PROGNAME)-export $(OBJDIR)/$(XFE_PROGNAME)-export.quantify
# Use gtscc to find dead code globals.
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) $(DIST)/bin/gtscc
unreferenced: $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(DIST)/bin/gtscc
@$(MAKE_OBJDIR)
rm -f $@
$(DIST)/bin/gtscc -gtsrootdir $(DEPTH) -gtsdump -gtsnorecompile -gtsnolink $(DEPTH) $(OBJS) $(NET_EXPORT_OBJS) $(BASIC_LIBS) $(EXPORT_LIB) $(BASIC_LIBS_2) $(NSPR_LIBS) | awk -n '/ 0 0 / { print $$5 " " $$1 }' | sort > $@

24
cmd/gnomefe/gnome-ctxt.c
Просмотреть файл

@ -1218,15 +1218,15 @@ FE_AboutData(const char* which,
a = strdup (
#ifdef JAVA
#ifndef MOZ_COMMUNICATOR_ABOUT
# include "../../l10n/us/xp/about-java-lite.h"
# include "xp/about-java-lite.h"
#else
# include "../../l10n/us/xp/about-java.h"
# include "xp/about-java.h"
#endif
#else
#ifndef MOZ_COMMUNICATOR_ABOUT
# include "../../l10n/us/xp/about-lite.h"
# include "xp/about-lite.h"
#else
# include "../../l10n/us/xp/about.h"
# include "xp/about.h"
#endif
#endif
);
@ -1248,15 +1248,15 @@ FE_AboutData(const char* which,
a = strdup (
#ifdef JAVA
#ifndef MOZ_COMMUNICATOR_ABOUT
# include "../../l10n/us/xp/splash-java-lite.h"
# include "xp/splash-java-lite.h"
#else
# include "../../l10n/us/xp/splash-java.h"
# include "xp/splash-java.h"
#endif
#else
#ifndef MOZ_COMMUNICATOR_ABOUT
# include "../../l10n/us/xp/splash-lite.h"
# include "xp/splash-lite.h"
#else
# include "../../l10n/us/xp/splash.h"
# include "xp/splash.h"
#endif
#endif
);
@ -1266,7 +1266,7 @@ FE_AboutData(const char* which,
{
ever_loaded_map = TRUE;
a = strdup (
# include "../../l10n/us/xp/authors2.h"
# include "xp/authors2.h"
);
}
else if (!strcmp (which,"license"))
@ -1289,7 +1289,7 @@ FE_AboutData(const char* which,
else if (!strcmp (which,"mozilla"))
{
a = strdup (
# include "../../l10n/us/xp/mozilla.h"
# include "xp/mozilla.h"
);
}
else if (!strcmp (which,
@ -1307,7 +1307,7 @@ FE_AboutData(const char* which,
#endif
{
a = strdup (
# include "../../l10n/us/xp/mail.h"
# include "xp/mail.h"
);
}
}
@ -1335,7 +1335,7 @@ FE_AboutData(const char* which,
#endif
{
a = strdup (
# include "../../l10n/us/xp/aboutplg.h"
# include "xp/aboutplg.h"
);
}
}