]>
Commit | Line | Data |
---|---|---|
13701c20 JB |
1 | --- gpac/src/Makefile.orig 2008-12-02 15:01:08.000000000 +0100 |
2 | +++ gpac/src/Makefile 2011-02-09 16:26:58.340693904 +0100 | |
3 | @@ -174,6 +174,10 @@ | |
4 | endif | |
5 | ||
6 | ifeq ($(WANT_PIC),yes) | |
7 | +LIBGPAC_MCRYPT_PIC=$(LIBGPAC_MCRYPT:.o=.opic) | |
8 | +LIBGPAC_SCENE_PIC=$(LIBGPAC_SCENE:.o=.opic) | |
9 | +LIBGPAC_MEDIATOOLS_PIC=$(LIBGPAC_MEDIATOOLS:.o=.opic) | |
10 | +LIBGPAC_COMPOSITOR_PIC=$(LIBGPAC_COMPOSITOR:.o=.opic) | |
11 | OBJSPIC=$(OBJS:.o=.opic) | |
12 | else | |
13 | OBJSPIC=$(OBJS) | |
14 | @@ -192,23 +196,19 @@ | |
15 | lib: $(LIB) | |
16 | ||
17 | #there's a bunch of warnings in there, get rid of them | |
18 | -mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include | |
19 | -mcrypt: $(LIBGPAC_MCRYPT) | |
20 | +$(LIBGPAC_MCRYPT) $(LIBGPAC_MCRYPT_PIC): CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include | |
21 | ||
22 | -scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS) | |
23 | -scenegraph: $(LIBGPAC_SCENE) | |
24 | +$(LIBGPAC_SCENE) $(LIBGPAC_SCENE_PIC): CFLAGS += $(SCENEGRAPH_CFLAGS) | |
25 | ||
26 | -mediatools: CFLAGS += $(MEDIATOOLS_CFLAGS) | |
27 | -mediatools: $(LIBGPAC_MEDIATOOLS) | |
28 | +$(LIBGPAC_MEDIATOOLS) $(LIBGPAC_MEDIATOOLS_PIC): CFLAGS += $(MEDIATOOLS_CFLAGS) | |
29 | ||
30 | -compositor: CFLAGS+=$(COMPOSITOR_CFLAGS) | |
31 | -compositor: $(LIBGPAC_COMPOSITOR) | |
32 | +$(LIBGPAC_COMPOSITOR) $(LIBGPAC_COMPOSITOR_PIC): CFLAGS+=$(COMPOSITOR_CFLAGS) | |
33 | ||
34 | %.o: %.c | |
35 | $(CC) $(CFLAGS) -c -o $@ $< | |
36 | ||
37 | ||
38 | -$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJSPIC) | |
39 | +$(LIB): $(OBJS) $(OBJSPIC) | |
40 | ar cr ../bin/gcc/libgpac_static.a $(OBJS) | |
41 | ranlib ../bin/gcc/libgpac_static.a | |
42 | $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) |