Reverted local adjustments to Makefile.target.

2 files changed, 6 insertions, 126 deletions

diff --git a/atari/Makefile.target b/atari/Makefile.target
index b2530cfa7..abd05c4d5 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -132,8 +132,8 @@ ATARI_TARGET_DIR := netsurf/
 ATARI_RES_DIR := atari/res/
 ATARI_DOC_DIR := atari/doc/
 ATARI_FONT_NAME := ttf-bitstream-vera-1.10
-#ATARI_FONT_SOURCE_URL := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/$(ATARI_FONT_NAME).tar.gz
-ATARI_FONT_SOURCE_URL := http://localhost/$(ATARI_FONT_NAME).tar.gz
+ATARI_FONT_SOURCE_URL := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/$(ATARI_FONT_NAME).tar.gz
+#ATARI_FONT_SOURCE_URL := http://localhost/$(ATARI_FONT_NAME).tar.gz
 ATARI_FONT_TMP_DIR := $(DEPROOT)/../
 ATARI_FONT_SOURCE_DIR := $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME)/
 ATARI_GENERIC_RESOURCES := de en it ja
@@ -157,10 +157,10 @@ package-atari: $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME) $(PKGNAME)
 	$(VQ)echo Creating $(PKGNAME)
 
 $(PKGNAME): $(EXETARGET)
-#ifneq ($(strip $(STRIP)),)
-#	$(Q)echo Stripping symbols from $(EXETARGET) with $(STRIP)
-#	$(Q)$(STRIP) $(EXETARGET)
-#endif
+ifneq ($(strip $(STRIP)),)
+	$(Q)echo Stripping symbols from $(EXETARGET) with $(STRIP)
+	$(Q)$(STRIP) $(EXETARGET)
+endif
 ifneq ($(strip $(STACK)),)
 	$(Q)$(STACK) -S 256k $(EXETARGET)
 endif
diff --git a/atari/Makefile.target.orig b/atari/Makefile.target.orig
deleted file mode 100644
index 25951b961..000000000
--- a/atari/Makefile.target.orig
+++ /dev/null
@@ -1,120 +0,0 @@
-# ----------------------------------------------------------------------------
-# Atari target setup
-# ----------------------------------------------------------------------------
-
-ifeq ($(ATARI_ARCH),68000)
-PRGSUFFIX := 000.app
-PKGNAME := ns000.zip
-endif
-
-ifeq ($(ATARI_ARCH),68020-60)
-CFLAGS += -m68020-60
-LDFLAGS += -m68020-60
-PRGSUFFIX := 020.app
-PKGNAME := ns020.zip
-endif
-
-ifeq ($(ATARI_ARCH),5475)
-CFLAGS += -mcpu=5475
-LDFLAGS += -mcpu=5475
-PRGSUFFIX := v4e.app
-PKGNAME := nsv4e.zip
-endif
-
-# non-pkgconfig components
-
-FREETYPE_FONT_CFLAGS := $(shell freetype-config --cflags) -DWITH_FREETYPE_FONT_DRIVER
-SPIDERMONKEY_CFLAGS := -DWITH_MOZJS -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE
-
-$(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG/MNG/JNG (libmng)))
-$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)))
-$(eval $(call feature_enabled,MOZJS,$(SPIDERMONKEY_CFLAGS),-ljs,JavaScript (Spidermonkey)))
-$(eval $(call feature_enabled,ATARI_FREETYPE_FONT,$(FREETYPE_FONT_CFLAGS),-lfreetype,(Freetype)))
-$(eval $(call feature_enabled,ATARI_NETSURF_FONT,-DWITH_INTERNAL_FONT_DRIVER,,(Internal Font)))
-$(eval $(call feature_enabled,ATARI_8BPP_SUPPORT,-DWITH_8BPP_SUPPORT,,(Indexed screen format support)))
-
-# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
-NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
-NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
-NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
-
-ifeq ($(NETSURF_USE_MOZJS),YES)
-NETSURF_USE_JS:=YES
-NETSURF_USE_MOZJS:=YES
-endif
-
-$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
-$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
-
-CFLAGS += -U__STRICT_ANSI__ -std=c99 -I. -Dsmall $(WARNFLAGS) -Dnsatari \
-		-D_BSD_SOURCE \
-		-D_XOPEN_SOURCE=600 \
-		-D_POSIX_C_SOURCE=200112L \
-		$(shell $(PKG_CONFIG) --cflags libhubbub libcss openssl ) \
-		$(shell $(PKG_CONFIG) --cflags libxml-2.0 ) \
-		$(shell $(PKG_CONFIG) --cflags libcurl )
-
-LDFLAGS += -lcflib -lcurl
-LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub
-LDFLAGS += -lssl -lcrypto
-LDFLAGS += -lxml2 -lz -liconv -lcares -lHermes -lwindom -lgem -lm
-LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
-
-
-# S_ATARI are sources purely for the Atari FreeMiNT build
-S_ATARI := gui.c findfile.c filetype.c misc.c bitmap.c schedule.c \
-	download.c thumbnail.c login.c verify_ssl.c treeview.c hotlist.c history.c\
-	search.c font.c \
-	plot/plot.c plot/fontplot.c plot/eddi.s \
-	plot/font_freetype.c plot/font_internal.c \
-	redrawslots.c encoding.c \
-	browser_win.c toolbar.c statusbar.c browser.c  \
-	global_evnt.c osspec.c dragdrop.c system_colour.c \
-	ctxmenu.c save.c settings.c
-S_ATARI := $(addprefix atari/,$(S_ATARI))
-
-# This is the final source build list
-# Note this is deliberately *not* expanded here as common and image
-#   are not yet available
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
-EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
-
-# ----------------------------------------------------------------------------
-# Install target
-# ----------------------------------------------------------------------------
-
-<<<<<<< Updated upstream
-install-atari:
-
-# ----------------------------------------------------------------------------
-# Package target
-# ----------------------------------------------------------------------------
-
-package-atari:
-=======
-ATARI_INSTALL_TARGET_DIR := nsatari.package
-ATARI_RES_DIR := atari/res
-
-install-atari: $(PKGNAME)
-	$(VQ)echo Creating $(PKGNAME)
-
-$(PKGNAME): $(EXETARGET)
-	$(Q)rm -rf $(ATARI_INSTALL_TARGET_DIR)
-	$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/
-	$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf
-	$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/doc
-	$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/download
-	$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res
-	$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/fonts
-	#$(Q)mkdir $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons
-	$(Q)touch $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/cookies
-	$(Q)cp $(ATARI_RES_DIR)/netsurf.rsc $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/netsurf.rsc
-	$(Q)cp $(ATARI_RES_DIR)/icons/ $(ATARI_INSTALL_TARGET_DIR)/netsurf/res/icons/ -R
-
-
-	$(Q)cp $(EXETARGET) $(ATARI_INSTALL_TARGET_DIR)/netsurf
-	
->>>>>>> Stashed changes