Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/e237ebac8f6cca443a52966de74934d98096be1f
...commit
http://git.netsurf-browser.org/netsurf.git/commit/e237ebac8f6cca443a52966de74934d98096be1f
...tree
http://git.netsurf-browser.org/netsurf.git/tree/e237ebac8f6cca443a52966de74934d98096be1f
The branch, master has been updated
via e237ebac8f6cca443a52966de74934d98096be1f (commit)
from e85284d7d15f8f64dc8074e57526ef100a9793bf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/e237ebac8f6cca443a52966de74934d98096be1f
commit e237ebac8f6cca443a52966de74934d98096be1f
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Split install and package targets.
Install target is for installing on the local machine and package generates
a package
diff --git a/Makefile b/Makefile
index 0dce8c8..da0d41e 100644
--- a/Makefile
+++ b/Makefile
@@ -633,61 +633,14 @@ $(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \
$(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \
$(call compile_target_s,$(SOURCE),$(subst /,_,$(SOURCE:.s=.o)),$(subst
/,_,$(SOURCE:.s=.d)))))
-.PHONY: all clean docs install install-gtk
+.PHONY: all clean docs install package-$(TARGET) package install-$(TARGET)
clean: $(CLEANS)
-install-gtk: nsgtk
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
- mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
- @cp nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
- @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/throbber/*.png
$(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install translations
- @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install glade templates
- @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
-
-install-beos: NetSurf
-# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- @copyattr -d NetSurf $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# @cp -vRL beos/res/throbber/*.png
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- gzip -9v < beos/res/messages >
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
-
-
-install-framebuffer: $(EXETARGET)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
- @cp -v $(EXETARGET)
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
- @for F in default.css messages; do cp -vL framebuffer/res/$$F
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+# Target builds a distribution package
+package: all-program package-$(TARGET)
+# Target installs executable on the host system
install: all-program install-$(TARGET)
docs:
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index c8046b4..bb2b1c7 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -95,7 +95,13 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA)
$(S_PDF)
# Install target
# ----------------------------------------------------------------------------
-install-amiga: netsurf.lha
+install-amiga:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-amiga: netsurf.lha
AMIGA_LANGUAGES := de en fr it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info
favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
@@ -108,7 +114,7 @@ AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))
AMIGA_DISTRIBUTION_FILES := amiga/dist/*
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
-netsurf.lha: NetSurf
+netsurf.lha: $(EXETARGET)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
$(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
diff --git a/atari/Makefile.target b/atari/Makefile.target
index cbd8e6f..f249b69 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -79,4 +79,14 @@ S_ATARI := $(addprefix atari/,$(S_ATARI))
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-atari:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+package-atari:
\ No newline at end of file
diff --git a/beos/Makefile.target b/beos/Makefile.target
index ec8719e..be58be4 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -111,3 +111,27 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS))
\
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
EXETARGET := NetSurf
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-beos:
+# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+ @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# @cp -vRL beos/res/throbber/*.png
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ gzip -9v < beos/res/messages >
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-beos:
\ No newline at end of file
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index b3ababd..635790a 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -187,6 +187,12 @@ endef
$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix
cocoa/res/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
$(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call
compile_xib,$(xib),$(lang)))))
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-cocoa: NetSurf.app
+
NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES)
NetSurf.app/Contents/Info.plist
$(VQ)echo Assembling NetSurf.app bundle
$(Q)mkdir -p NetSurf.app/Contents/MacOS
@@ -206,6 +212,12 @@ NetSurf.app/Contents/Info.plist:
cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar
-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/'
\
< cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-cocoa: NetSurf.dmg
+
NetSurf.tmp.dmg: NetSurf.app
hdiutil create -size 8m -fs HFS+ -volname "NetSurf" $@
hdiutil attach $@
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 974427a..8cca120 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -154,4 +154,20 @@ S_FRAMEBUFFER := $(addprefix
framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuf
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES)
-EXETARGET := nsfb$(SUBTARGET)
+EXETARGET := nsfb
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-framebuffer:
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ @cp -v $(EXETARGET)
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
+ @for F in default.css messages; do cp -vL framebuffer/res/$$F
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-framebuffer:
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 0fd0acf..3934d13 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf GTK target
+#
+# This file is part of NetSurf
+#
# ----------------------------------------------------------------------------
# GTK flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -118,3 +123,43 @@ S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix
utils/,container.c)
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_PIXBUF) $(S_GTK)
EXETARGET := nsgtk
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-gtk:
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ @cp $< $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
+ @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/throbber/*.png
$(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install translations
+ @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install glade templates
+ @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-gtk:
diff --git a/monkey/Makefile.target b/monkey/Makefile.target
index 3524b31..b72734f 100644
--- a/monkey/Makefile.target
+++ b/monkey/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf monkey target
+#
+# This file is part of NetSurf
+
# ----------------------------------------------------------------------------
# Monkey flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -65,3 +70,15 @@ S_MONKEY := $(addprefix monkey/,$(S_MONKEY))
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_MONKEY)
EXETARGET := nsmonkey
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-monkey:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-monkey:
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index 44d57c5..2dd246a 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -1,4 +1,7 @@
-# RISC OS Target makefile
+#
+# Makefile for NetSurf RISC OS target
+#
+# This file is part of NetSurf
# ----------------------------------------------------------------------------
# RISC OS target setup
@@ -105,6 +108,14 @@ CLEANS += clean-run
# Install target
# ----------------------------------------------------------------------------
+install-riscos:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-riscos: netsurf.zip
+
netsurf.zip: $(EXETARGET)
$(eval $@_TMPDIR := $(shell mktemp -d))
$(Q) $(RM) $@
diff --git a/windows/Makefile.target b/windows/Makefile.target
index f19d3ac..f358999 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -1,6 +1,7 @@
-# ----------------------------------------------------------------------------
-# Windows target setup
-# ----------------------------------------------------------------------------
+#
+# Makefile for NetSurf Windows target
+#
+# This file is part of NetSurf
LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib
CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/
@@ -76,7 +77,13 @@ EXETARGET := NetSurf.exe
# Install target
# ----------------------------------------------------------------------------
-install-windows: netsurf-installer.exe
+install-windows:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-windows: netsurf-installer.exe
WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css
messages
WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ))
-----------------------------------------------------------------------
Summary of changes:
Makefile | 55 +++---------------------------------------
amiga/Makefile.target | 10 ++++++-
atari/Makefile.target | 10 ++++++++
beos/Makefile.target | 24 ++++++++++++++++++
cocoa/Makefile.target | 12 +++++++++
framebuffer/Makefile.target | 18 +++++++++++++-
gtk/Makefile.target | 45 +++++++++++++++++++++++++++++++++++
monkey/Makefile.target | 17 +++++++++++++
riscos/Makefile.target | 13 +++++++++-
windows/Makefile.target | 15 ++++++++---
10 files changed, 160 insertions(+), 59 deletions(-)
diff --git a/Makefile b/Makefile
index 0dce8c8..da0d41e 100644
--- a/Makefile
+++ b/Makefile
@@ -633,61 +633,14 @@ $(eval $(foreach SOURCE,$(filter %.m,$(SOURCES)), \
$(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \
$(call compile_target_s,$(SOURCE),$(subst /,_,$(SOURCE:.s=.o)),$(subst
/,_,$(SOURCE:.s=.d)))))
-.PHONY: all clean docs install install-gtk
+.PHONY: all clean docs install package-$(TARGET) package install-$(TARGET)
clean: $(CLEANS)
-install-gtk: nsgtk
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
- mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
- @cp nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
- @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/throbber/*.png
$(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
- @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install translations
- @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @# Install glade templates
- @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
-
-install-beos: NetSurf
-# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- @copyattr -d NetSurf $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
- @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
- @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
-# @cp -vRL beos/res/throbber/*.png
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- gzip -9v < beos/res/messages >
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
-
-
-install-framebuffer: $(EXETARGET)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
- mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
- @cp -v $(EXETARGET)
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
- @for F in default.css messages; do cp -vL framebuffer/res/$$F
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+# Target builds a distribution package
+package: all-program package-$(TARGET)
+# Target installs executable on the host system
install: all-program install-$(TARGET)
docs:
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index c8046b4..bb2b1c7 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -95,7 +95,13 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA)
$(S_PDF)
# Install target
# ----------------------------------------------------------------------------
-install-amiga: netsurf.lha
+install-amiga:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-amiga: netsurf.lha
AMIGA_LANGUAGES := de en fr it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info
favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
@@ -108,7 +114,7 @@ AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))
AMIGA_DISTRIBUTION_FILES := amiga/dist/*
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
-netsurf.lha: NetSurf
+netsurf.lha: $(EXETARGET)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
$(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
diff --git a/atari/Makefile.target b/atari/Makefile.target
index cbd8e6f..f249b69 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -79,4 +79,14 @@ S_ATARI := $(addprefix atari/,$(S_ATARI))
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI)
EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-atari:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+package-atari:
\ No newline at end of file
diff --git a/beos/Makefile.target b/beos/Makefile.target
index ec8719e..be58be4 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -111,3 +111,27 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS))
\
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
EXETARGET := NetSurf
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-beos:
+# TODO:HAIKU -- not sure if throbber is needed. being left out for now.
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf
+ @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+ @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
+# @cp -vRL beos/res/throbber/*.png
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
+ gzip -9v < beos/res/messages >
$(DESTDIR)$(NETSURF_BEOS_RESOURCES)messages
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-beos:
\ No newline at end of file
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index b3ababd..635790a 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -187,6 +187,12 @@ endef
$(foreach lang,$(LANGUAGES),$(eval $(call make_lproj,$(lang),$(addprefix
cocoa/res/$(lang).lproj/,$(LOCALIZED_RESOURCES)))))
$(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call
compile_xib,$(xib),$(lang)))))
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-cocoa: NetSurf.app
+
NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES)
NetSurf.app/Contents/Info.plist
$(VQ)echo Assembling NetSurf.app bundle
$(Q)mkdir -p NetSurf.app/Contents/MacOS
@@ -206,6 +212,12 @@ NetSurf.app/Contents/Info.plist:
cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar
-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/'
\
< cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-cocoa: NetSurf.dmg
+
NetSurf.tmp.dmg: NetSurf.app
hdiutil create -size 8m -fs HFS+ -volname "NetSurf" $@
hdiutil attach $@
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 974427a..8cca120 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -154,4 +154,20 @@ S_FRAMEBUFFER := $(addprefix
framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuf
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES)
-EXETARGET := nsfb$(SUBTARGET)
+EXETARGET := nsfb
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-framebuffer:
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_BIN)
+ mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
+ @cp -v $(EXETARGET)
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
+ @for F in default.css messages; do cp -vL framebuffer/res/$$F
$(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-framebuffer:
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 0fd0acf..3934d13 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf GTK target
+#
+# This file is part of NetSurf
+#
# ----------------------------------------------------------------------------
# GTK flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -118,3 +123,43 @@ S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix
utils/,container.c)
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_PIXBUF) $(S_GTK)
EXETARGET := nsgtk
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-gtk:
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons
+ mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)
+ @cp $< $(DESTDIR)$(NETSURF_GTK_BIN)netsurf
+ @cp -RL gtk/res/adblock.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/arrow_down_8x32.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/ca-bundle.txt $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/internal.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/themelist $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/throbber/*.png
$(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
+ @cp -RL gtk/res/toolbarIndices $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/SearchEngines $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @tar cf - --exclude .svn -C gtk/res themes | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install translations
+ @tar cf - --exclude .svn -C gtk/res C de en fr it nl | tar xf - -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @# Install glade templates
+ @cp -v gtk/res/*.gtk*.ui $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-gtk:
diff --git a/monkey/Makefile.target b/monkey/Makefile.target
index 3524b31..b72734f 100644
--- a/monkey/Makefile.target
+++ b/monkey/Makefile.target
@@ -1,3 +1,8 @@
+#
+# Makefile for NetSurf monkey target
+#
+# This file is part of NetSurf
+
# ----------------------------------------------------------------------------
# Monkey flag setup (using pkg-config)
# ----------------------------------------------------------------------------
@@ -65,3 +70,15 @@ S_MONKEY := $(addprefix monkey/,$(S_MONKEY))
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_MONKEY)
EXETARGET := nsmonkey
+
+# ----------------------------------------------------------------------------
+# Install target
+# ----------------------------------------------------------------------------
+
+install-monkey:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-monkey:
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index 44d57c5..2dd246a 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -1,4 +1,7 @@
-# RISC OS Target makefile
+#
+# Makefile for NetSurf RISC OS target
+#
+# This file is part of NetSurf
# ----------------------------------------------------------------------------
# RISC OS target setup
@@ -105,6 +108,14 @@ CLEANS += clean-run
# Install target
# ----------------------------------------------------------------------------
+install-riscos:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-riscos: netsurf.zip
+
netsurf.zip: $(EXETARGET)
$(eval $@_TMPDIR := $(shell mktemp -d))
$(Q) $(RM) $@
diff --git a/windows/Makefile.target b/windows/Makefile.target
index f19d3ac..f358999 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -1,6 +1,7 @@
-# ----------------------------------------------------------------------------
-# Windows target setup
-# ----------------------------------------------------------------------------
+#
+# Makefile for NetSurf Windows target
+#
+# This file is part of NetSurf
LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib
CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/
@@ -76,7 +77,13 @@ EXETARGET := NetSurf.exe
# Install target
# ----------------------------------------------------------------------------
-install-windows: netsurf-installer.exe
+install-windows:
+
+# ----------------------------------------------------------------------------
+# Package target
+# ----------------------------------------------------------------------------
+
+package-windows: netsurf-installer.exe
WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css
messages
WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ))
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
