]>
Commit | Line | Data |
---|---|---|
440a0087 | 1 | diff -Naur dgee-0.1.6.orig/dglib/Makefile.in dgee-0.1.6/dglib/Makefile.in |
2 | --- dgee-0.1.6.orig/dglib/Makefile.in 2003-12-07 10:59:52.000000000 +0100 | |
3 | +++ dgee-0.1.6/dglib/Makefile.in 2003-12-07 11:41:11.000000000 +0100 | |
4 | @@ -21,6 +21,7 @@ | |
5 | VERSION = $(VER_MAJOR).$(VER_MINOR) | |
6 | ||
7 | ALLINC = $(addprefix -I,$(AINC)) | |
8 | +INSTALL=/usr/bin/install | |
9 | ||
10 | # Uses _BSD_SOURCE to get some definitions | |
11 | # | |
12 | @@ -48,7 +49,7 @@ | |
13 | # | |
14 | devel := CFLAGS += -g -DDEVELOPMENT | |
15 | ||
16 | -all: directories $(DGXMLLIB) $(DGXMLLIBSO) $(DGLIB) $(DGLIBSO) | |
17 | +all: directories $(DGXMLLIB) $(DGXMLLIBSO).$(VERSION) $(DGLIB) $(DGLIBSO).$(VERSION) | |
18 | @echo Done | |
19 | ||
20 | directories: | |
21 | @@ -60,10 +61,11 @@ | |
22 | @ar -r $@ $(OBJS) | |
23 | @ranlib $@ | |
24 | ||
25 | -$(DGLIBSO): $(OBJS) | |
26 | +$(DGLIBSO).$(VERSION): $(OBJS) | |
27 | @echo Creating shared library $(DGLIBSO) | |
28 | @rm -f $@ | |
29 | - $(LD) -shared -noinhibit-exec -o$@ $(OBJS) -L$(PXLIBDIR) -lpxtra | |
4e128f17 | 30 | + $(LD) -shared -h$(DGLIBSO).$(VER_MAJOR) -noinhibit-exec -o$@ $(OBJS) -L$(PXLIBDIR) -lpxtra -lgwtx |
440a0087 | 31 | + ln -s $@ $(DGLIBSO) |
32 | ||
33 | $(DGXMLLIB): $(OBJSXML) $(HEAD) | |
34 | @echo Creating library $(DGXMLLIB) | |
35 | @@ -71,10 +73,11 @@ | |
36 | @ar -r $@ $(OBJSXML) | |
37 | @ranlib $@ | |
38 | ||
39 | -$(DGXMLLIBSO): $(OBJSXML) | |
40 | +$(DGXMLLIBSO).$(VERSION): $(OBJSXML) | |
41 | @echo Creating shared library $(DGXMLLIBSO) | |
42 | @rm -f $@ | |
43 | - $(LD) -shared -noinhibit-exec -o$@ $(OBJSXML) -L$(PXLIBDIR) -lpxtra | |
4e128f17 | 44 | + $(LD) -shared -h$(DGXMLLIBSO).$(VER_MAJOR) -noinhibit-exec -o$@ $(OBJSXML) -L$(PXLIBDIR) -lpxtra -lexpat |
440a0087 | 45 | + ln -s $@ $(DGXMLLIBSO) |
46 | ||
47 | xmltreetest: $(OBJ)/test.o | |
48 | $(CC) $(OBJ)/main.o $(LFLAG) -L. -o$@ -ldgee -lexpat | |
49 | @@ -92,10 +95,10 @@ | |
50 | ||
51 | install: | |
52 | @echo "Installing DGEE Libraries" | |
53 | - @../mkinstalldirs $(i_libdir) $(MINC) | |
54 | - @../install-lib $(DGLIB) $(DGLIB) $(i_libdir) $(VER_MAJOR) $(VER_MINOR) | |
55 | - @../install-lib $(DGLIBSO) $(DGLIBSO) $(i_libdir) $(VER_MAJOR) $(VER_MINOR) | |
56 | - @../install-lib $(DGXMLLIB) $(DGXMLLIB) $(i_libdir) $(VER_MAJOR) $(VER_MINOR) | |
57 | - @../install-lib $(DGXMLLIBSO) $(DGXMLLIBSO) $(i_libdir) $(VER_MAJOR) $(VER_MINOR) | |
58 | - | |
59 | + $(INSTALL) -d $(i_libdir) | |
60 | + $(INSTALL) $(DGLIB) $(i_libdir)/$(DGLIB) | |
61 | + $(INSTALL) $(DGLIBSO).$(VERSION) $(i_libdir)/$(DGLIBSO).$(VERSION) | |
62 | + $(INSTALL) $(DGXMLLIB) $(i_libdir)/$(DGXMLLIB) | |
63 | + $(INSTALL) $(DGXMLLIBSO).$(VERSION) $(i_libdir)/$(DGXMLLIBSO).$(VERSION) | |
64 | + | |
65 | #end |