Mercurial > mxe-octave

annotate src/freeimage-1-no-shared.patch @ 762:a834626f7a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add missing CR characters to the patch of package freeimage
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 16 Feb 2010 21:23:19 +0100
parents a15ef607412d
children 7b84a94a9df1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
761
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 diff -urN a/Makefile.gnu b/Makefile.gnu
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 --- a/Makefile.gnu 2009-07-28 06:35:26.000000000 +0200
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 +++ b/Makefile.gnu 2010-02-16 11:50:50.509897756 +0100
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 @@ -9,7 +9,7 @@
762
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
8 INSTALLDIR ?= $(DESTDIR)/usr/lib
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
9
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
10 # Converts cr/lf to just lf
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
11 -DOS2UNIX = dos2unix
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
12 +DOS2UNIX = echo 'dos2unix not needed '
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
13
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
14 LIBRARIES = -lstdc++
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
15
761
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -40,13 +40,12 @@
762
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
17
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
18 dist: FreeImage
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
19 cp *.a Dist
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
20 - cp *.so Dist
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
21 cp Source/FreeImage.h Dist
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
22
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
23 dos2unix:
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
24 @$(DOS2UNIX) $(SRCS) $(INCLS)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
25
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
26 -FreeImage: $(STATICLIB) $(SHAREDLIB)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
27 +FreeImage: $(STATICLIB)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
28
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
29 .c.o:
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
30 $(CC) $(CFLAGS) -c $< -o $@
761
a15ef607412d new package: freeimage
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 @@ -62,9 +61,8 @@
762
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
32
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
33 install:
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
34 install -d $(INCDIR) $(INSTALLDIR)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
35 - install -m 644 -o root -g root $(HEADER) $(INCDIR)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
36 - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
37 - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
38 + install -m 644 $(HEADER) $(INCDIR)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
39 + install -m 644 $(STATICLIB) $(INSTALLDIR)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
40
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
41 clean:
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
42 rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
a834626f7a0f add missing CR characters to the patch of package freeimage
Volker Grabsch <vog@notjusthosting.com>
parents: 761
diff changeset
43 # Linux makefile for FreeImage