Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/freeimage-01-makefile.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 272 f91aba05b068
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
272
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     1
 
diff -ur FreeImage-orig/Makefile.solaris FreeImage/Makefile.solaris
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     2
 
--- FreeImage-orig/Makefile.solaris	2005-04-12 06:32:52.000000000 +0700
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     3
 
+++ FreeImage/Makefile.solaris	2007-05-07 12:02:02.694485503 +0700
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     4
 
@@ -5,27 +5,26 @@
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     5
 
 include Makefile.srcs
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     6
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     7
 
 # General configuration variables:
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     8
 
-CC = gcc
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
     9
 
-CPP = g++
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    10
 
+CPP = $(CXX)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    11
 
 AR = ar
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    12
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    13
 
-INSTALLDIR = /usr/local
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    14
 
+INSTALLDIR = $(DESTDIR)/usr
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    15
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    16
 
 # Converts cr/lf to just lf
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    17
 
 DOS2UNIX = dos2unix
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    18
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    19
 
-COMPILERFLAGS = -O3
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    20
 
-LIBRARIES = -lstdc++
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    21
 
+COMPILERFLAGS =
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    22
 
+LIBRARIES =
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    23
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    24
 
 MODULES = $(SRCS:.c=.o)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    25
 
 MODULES := $(MODULES:.cpp=.o)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    26
 
-CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    27
 
-CPPFLAGS = $(COMPILERFLAGS)  -Wno-ctor-dtor-privacy $(INCLUDE)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    28
 
+CPPFLAGS = $(INCLUDE)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    29
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    30
 
 TARGET  = freeimage
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    31
 
 STATICLIB = lib$(TARGET).a
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    32
 
 SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    33
 
 LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    34
 
+SHORTLIBNAME = lib$(TARGET).so
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    35
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    36
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    37
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    38
 
@@ -44,22 +43,25 @@
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    39
 
 FreeImage: $(STATICLIB) $(SHAREDLIB)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    40
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    41
 
 .c.o:
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    42
 
-	$(CC) $(CFLAGS) -c $< -o $@
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    43
 
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    44
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    45
 
 .cpp.o:
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    46
 
-	$(CPP) $(CPPFLAGS) -c $< -o $@
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    47
 
+	$(CPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    48
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    49
 
 $(STATICLIB): $(MODULES)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    50
 
 	$(AR) r $@ $(MODULES)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    51
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    52
 
 $(SHAREDLIB): $(MODULES)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    53
 
-	$(CC) -s -G -Wl,-soname=$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    54
 
+	$(CC) -s -G -Wl,-h$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    55
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    56
 
 install:
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    57
 
-	install -m 644 -o root -g root Source/FreeImage.h $(INSTALLDIR)/include
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    58
 
-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)/lib
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    59
 
-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)/lib
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    60
 
+	mkdir -p $(INSTALLDIR)/include
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    61
 
+	mkdir -p $(INSTALLDIR)/lib
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    62
 
+	install -m 644 Source/FreeImage.h $(INSTALLDIR)/include
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    63
 
+	install -m 644 $(STATICLIB) $(INSTALLDIR)/lib
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    64
 
+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)/lib
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    65
 
 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/lib/$(LIBNAME)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    66
 
+	ln -sf $(SHAREDLIB) $(INSTALLDIR)/lib/$(SHORTLIBNAME)
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    67
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    68
 
 clean:
f91aba05b068 2007-05-07 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset 
    69
 
 	rm -rf core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
upstream/spec-files-extra