]>
Commit | Line | Data |
---|---|---|
e517172c JB |
1 | --- libfad-0.9.6/src/Makefile.orig 2006-09-19 17:46:49.000000000 +0200 |
2 | +++ libfad-0.9.6/src/Makefile 2018-08-30 18:09:21.536283300 +0200 | |
3 | @@ -5,60 +5,6 @@ | |
4 | fad.fontext.o fad.frame.o fad.jpeg.o fad.shape.o fad.morph.o \ | |
5 | fad.sound.o fad.sprite.o fad.stream.o fad.utils.o fad.render.o | |
6 | ||
7 | -ZLIB_SUBDIR=zlib | |
8 | -JPEG_SUBDIR=jpeg | |
9 | -LIBMAD_SUBDIR=libmad | |
10 | - | |
11 | -ZLIB_OBJS=$(ZLIB_SUBDIR)/adler32.o \ | |
12 | - $(ZLIB_SUBDIR)/crc32.o \ | |
13 | - $(ZLIB_SUBDIR)/zutil.o \ | |
14 | - $(ZLIB_SUBDIR)/trees.o \ | |
15 | - $(ZLIB_SUBDIR)/inffast.o \ | |
16 | - $(ZLIB_SUBDIR)/inftrees.o \ | |
17 | - $(ZLIB_SUBDIR)/infback.o \ | |
18 | - $(ZLIB_SUBDIR)/inflate.o \ | |
19 | - $(ZLIB_SUBDIR)/uncompr.o | |
20 | - | |
21 | - | |
22 | -JPEG_OBJS=$(JPEG_SUBDIR)/jdapistd.o \ | |
23 | - $(JPEG_SUBDIR)/jdcolor.o \ | |
24 | - $(JPEG_SUBDIR)/jdcoefct.o \ | |
25 | - $(JPEG_SUBDIR)/jdatasrc.o \ | |
26 | - $(JPEG_SUBDIR)/jddctmgr.o \ | |
27 | - $(JPEG_SUBDIR)/jdmarker.o \ | |
28 | - $(JPEG_SUBDIR)/jdpostct.o \ | |
29 | - $(JPEG_SUBDIR)/jdinput.o \ | |
30 | - $(JPEG_SUBDIR)/jidctred.o \ | |
31 | - $(JPEG_SUBDIR)/jdhuff.o \ | |
32 | - $(JPEG_SUBDIR)/jdphuff.o \ | |
33 | - $(JPEG_SUBDIR)/jidctflt.o \ | |
34 | - $(JPEG_SUBDIR)/jutils.o \ | |
35 | - $(JPEG_SUBDIR)/jidctfst.o \ | |
36 | - $(JPEG_SUBDIR)/jcomapi.o \ | |
37 | - $(JPEG_SUBDIR)/jquant1.o \ | |
38 | - $(JPEG_SUBDIR)/jquant2.o \ | |
39 | - $(JPEG_SUBDIR)/jdapimin.o \ | |
40 | - $(JPEG_SUBDIR)/jidctint.o \ | |
41 | - $(JPEG_SUBDIR)/jmemmgr.o \ | |
42 | - $(JPEG_SUBDIR)/jmemname.o \ | |
43 | - $(JPEG_SUBDIR)/jdmaster.o \ | |
44 | - $(JPEG_SUBDIR)/jdsample.o \ | |
45 | - $(JPEG_SUBDIR)/jdtrans.o \ | |
46 | - $(JPEG_SUBDIR)/jdmainct.o \ | |
47 | - $(JPEG_SUBDIR)/jdatadst.o \ | |
48 | - $(JPEG_SUBDIR)/jdmerge.o \ | |
49 | - $(JPEG_SUBDIR)/jerror.o | |
50 | - | |
51 | -LIBMAD_OBJS=$(LIBMAD_SUBDIR)/bit.o \ | |
52 | - $(LIBMAD_SUBDIR)/fixed.o \ | |
53 | - $(LIBMAD_SUBDIR)/frame.o \ | |
54 | - $(LIBMAD_SUBDIR)/huffman.o \ | |
55 | - $(LIBMAD_SUBDIR)/layer12.o \ | |
56 | - $(LIBMAD_SUBDIR)/layer3.o \ | |
57 | - $(LIBMAD_SUBDIR)/stream.o \ | |
58 | - $(LIBMAD_SUBDIR)/synth.o \ | |
59 | - $(LIBMAD_SUBDIR)/timer.o | |
60 | - | |
61 | LIBMAD_CFLAGS=-DFPM_INTEL | |
62 | ||
63 | DEBUG=-g -DLIBFAD_DO_RENDER #-DLIBFAD_DEBUG # -DLIBFAD_DEBUG # -DLIBFAD_DEBUG | |
64 | @@ -75,32 +21,22 @@ | |
65 | ||
66 | SHAREDLIBV=libfad.so.$(VER) | |
67 | ||
68 | -all:$(SHAREDLIBV) | |
69 | +all:$(SHAREDLIBV) $(STATICLIB) | |
70 | -@if [ ! -f $(SHAREDLIB) ]; then ln -s $(SHAREDLIBV) $(SHAREDLIB); fi | |
71 | -@if [ ! -f $(SHAREDLIBM) ]; then ln -s $(SHAREDLIBV) $(SHAREDLIBM); fi | |
72 | ||
73 | -$(SHAREDLIBV): $(ZLIB_OBJS) $(JPEG_OBJS) $(LIBMAD_OBJS) $(OBJS) | |
74 | - $(CC) $(LDFLAGS) -o $(SHAREDLIBV) $(OBJS) $(JPEG_OBJS) $(ZLIB_OBJS) $(LIBMAD_OBJS) | |
75 | -# $(AR) -r $(STATICLIB) $(OBJS) $(JPEG_OBJS) $(ZLIB_OBJS) | |
76 | +$(SHAREDLIBV): $(OBJS) | |
77 | + $(CC) $(LDFLAGS) -o $(SHAREDLIBV) $(OBJS) -ljpeg -lz -lmad | |
78 | + | |
79 | +$(STATICLIB): $(OBJS) | |
80 | + $(AR) -r $(STATICLIB) $(OBJS) | |
81 | ||
82 | #compile libFAD source code | |
83 | fad.%.o: fad.%.c | |
84 | $(CC) $(CFLAGS) -c $< -o $@ | |
85 | ||
86 | -#compile ZLIB source code | |
87 | -$(ZLIB_SUBDIR)/%.o: $(ZLIB_SUBDIR)/%.c | |
88 | - $(CC) -c $< -o $@ | |
89 | - | |
90 | -#compile JPEG source code | |
91 | -$(JPEG_SUBDIR)/%.o: $(JPEG_SUBDIR)/%.c | |
92 | - $(CC) -c $< -o $@ | |
93 | - | |
94 | -#compile libmad source code | |
95 | -$(LIBMAD_SUBDIR)/%.o: $(LIBMAD_SUBDIR)/%.c | |
96 | - $(CC) $(LIBMAD_CFLAGS) -c $< -o $@ | |
97 | - | |
98 | clean: | |
99 | - rm $(OBJS) $(ZLIB_OBJS) $(JPEG_OBJS) $(LIBMAD_OBJS) *.txt *.bak *.copy $(SHAREDLIBM) $(SHAREDLIBV) $(SHAREDLIB) $(STATICLIB) -f | |
100 | + rm $(OBJS) *.txt *.bak *.copy $(SHAREDLIBM) $(SHAREDLIBV) $(SHAREDLIB) $(STATICLIB) -f | |
101 | ||
102 | install: $(SHAREDLIBV) | |
103 | -@if [ ! -d $(PREFIX)/include ]; then mkdir -p $(PREFIX)/include; fi |