diff options
author | Micael Karlberg <[email protected]> | 2011-10-19 16:22:46 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-10-19 16:22:46 +0200 |
commit | 97282ecb85d44b12a452563b0eb594404f7144e1 (patch) | |
tree | 0614c1fd31642af816fbdc58f909622dbfc116a4 /lib/wx/examples | |
parent | 39c80cd3049a2381dfbe0b86c6578ca12309c104 (diff) | |
parent | 082b1930ac507a2eda2f9b3f61751d794e77a6f7 (diff) | |
download | otp-97282ecb85d44b12a452563b0eb594404f7144e1.tar.gz otp-97282ecb85d44b12a452563b0eb594404f7144e1.tar.bz2 otp-97282ecb85d44b12a452563b0eb594404f7144e1.zip |
Merge branch 'bmk/inets/httpc/20111011/host_header_format/OTP-9628' into bmk/inets/inets58_integration
Diffstat (limited to 'lib/wx/examples')
-rwxr-xr-x | lib/wx/examples/demo/Makefile | 2 | ||||
-rw-r--r-- | lib/wx/examples/simple/Makefile | 2 | ||||
-rwxr-xr-x | lib/wx/examples/sudoku/Makefile | 2 | ||||
-rwxr-xr-x | lib/wx/examples/xrc/Makefile | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/lib/wx/examples/demo/Makefile b/lib/wx/examples/demo/Makefile index 98d7c6a130..8afa0e780e 100755 --- a/lib/wx/examples/demo/Makefile +++ b/lib/wx/examples/demo/Makefile @@ -80,7 +80,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk docs: -release_spec: +release_spec: opt $(INSTALL_DIR) $(EXRELSYSDIR) $(INSTALL_DATA) $(TESTSRC) $(EXRELSYSDIR) $(INSTALL_DATA) $(TESTTARGETS) $(EXRELSYSDIR) diff --git a/lib/wx/examples/simple/Makefile b/lib/wx/examples/simple/Makefile index 41f0b46eb1..66f5952f0d 100644 --- a/lib/wx/examples/simple/Makefile +++ b/lib/wx/examples/simple/Makefile @@ -51,7 +51,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk docs: -release_spec: +release_spec: opt $(INSTALL_DIR) $(EXRELSYSDIR) $(INSTALL_DATA) $(TESTSRC) $(EXRELSYSDIR) $(INSTALL_DATA) copy.xpm sample.xpm $(TESTTARGETS) $(EXRELSYSDIR) diff --git a/lib/wx/examples/sudoku/Makefile b/lib/wx/examples/sudoku/Makefile index b86c654fdd..33725756b7 100755 --- a/lib/wx/examples/sudoku/Makefile +++ b/lib/wx/examples/sudoku/Makefile @@ -51,7 +51,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk docs: -release_spec: +release_spec: opt $(INSTALL_DIR) $(EXRELSYSDIR) $(INSTALL_DATA) $(TESTSRC) sudoku.hrl $(EXRELSYSDIR) $(INSTALL_DATA) $(TESTTARGETS) $(EXRELSYSDIR) diff --git a/lib/wx/examples/xrc/Makefile b/lib/wx/examples/xrc/Makefile index 1dfaae9689..aba58e0d0f 100755 --- a/lib/wx/examples/xrc/Makefile +++ b/lib/wx/examples/xrc/Makefile @@ -28,7 +28,8 @@ TESTMODS = xrc TESTTARGETS = $(TESTMODS:%=%.beam) TESTSRC = $(TESTMODS:%=%.erl) -RESOURCEFILES = appicon.ico basicdlg.xpm custclas.xpm fileopen.gif menu.xrc \ +RESOURCEFILES = \ + appicon.ico basicdlg.xpm custclas.xpm fileopen.gif menu.xrc \ resource.xrc uncenter.xpm variable.xrc appicon.xpm basicdlg.xrc \ custclas.xrc filesave.gif platform.xpm stop.xpm uncenter.xrc \ artprov.xpm controls.xpm derivdlg.xpm frame.xrc platform.xrc \ @@ -59,7 +60,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk docs: -release_spec: +release_spec: opt $(INSTALL_DIR) $(EXRELSYSDIR) $(INSTALL_DATA) $(TESTSRC) $(EXRELSYSDIR) $(INSTALL_DATA) $(TESTTARGETS) $(EXRELSYSDIR) |