summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authordamiano1998-12-28 15:48:35 +0000
committerdamiano1998-12-28 15:48:35 +0000
commitc32508e67bb56fb59c85e7fe298610656756b393 (patch)
treef6f2fb7312e0ef17614f9c47636322395582e558 /src/Makefile
parentff5b5d047fc3e237ad49e0673ee30d380505d511 (diff)
downloadivy-c-c32508e67bb56fb59c85e7fe298610656756b393.zip
ivy-c-c32508e67bb56fb59c85e7fe298610656756b393.tar.gz
ivy-c-c32508e67bb56fb59c85e7fe298610656756b393.tar.bz2
ivy-c-c32508e67bb56fb59c85e7fe298610656756b393.tar.xz
Correction de debian/rules et src/Makefile
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile33
1 files changed, 20 insertions, 13 deletions
diff --git a/src/Makefile b/src/Makefile
index 40d7b7c..aff6ada 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,6 +17,13 @@ OBJ = ivyloop.o timer.o ivysocket.o ivy.o
GOBJ = ivyloop.o timer.o ivysocket.o givy.o
XTOBJ = ivyxtloop.o ivysocket.o ivy.o
+ifneq (strip $(MAJOR),)
+MAJOR=1
+endif
+ifneq(strip $(MINOR),)
+MINOR=2
+endif
+
.c.o:
$(CC) -fPIC $(CFLAGS) -c $*.c
@@ -24,7 +31,7 @@ all: static-libs commands shared-libs
static-libs: libivy.a libgivy.a libxtivy.a
-shared-libs: libivy.so.$(VERSION).$(MAJOR_MINOR) libgivy.so.$(VERSION).$(MAJOR_MINOR) libxtivy.so.$(VERSION).$(MAJOR_MINOR)
+shared-libs: libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so.$(MAJOR).$(MINOR)
commands: testivy testxtivy
@@ -52,14 +59,14 @@ libxtivy.a: $(XTOBJ)
rm -f $@
ar cq $@ $(XTOBJ)
-libivy.so.$(VERSION).$(MAJOR_MINOR): $(OBJ)
- $(CC) -shared -Wl,-soname,libivy.so.$(VERSION) -o $@ $(OBJ) -lc
+libivy.so.$(MAJOR).$(MINOR): $(OBJ)
+ $(CC) -shared -Wl,-soname,libivy.so.$(MAJOR) -o $@ $(OBJ) -lc
-libgivy.so.$(VERSION).$(MAJOR_MINOR): $(GOBJ)
- $(CC) -shared -Wl,-soname,libgivy.so.$(VERSION) -o $@ $(GOBJ) -lc
+libgivy.so.$(MAJOR).$(MINOR): $(GOBJ)
+ $(CC) -shared -Wl,-soname,libgivy.so.$(MAJOR) -o $@ $(GOBJ) -lc
-libxtivy.so.$(VERSION).$(MAJOR_MINOR): $(XTOBJ)
- $(CC) -shared -Wl,-soname,libxtivy.so.$(VERSION) -o $@ \
+libxtivy.so.$(MAJOR).$(MINOR): $(XTOBJ)
+ $(CC) -shared -Wl,-soname,libxtivy.so.$(MAJOR) -o $@ \
$(XTOBJ) -L$(XTLIB) -lXt -lX11 -lc
clean:
@@ -73,11 +80,11 @@ install: all
install -m644 libgivy.a $(DESTDIR)/usr/lib
install -m644 libxtivy.a $(DESTDIR)/usr/X11R6/lib
- install -m644 libivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/lib
- install -m644 libgivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/lib
- install -m644 libxtivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/X11R6/lib
- cd $(DESTDIR)/usr/lib && ln -s libivy.so.$(VERSION).$(MAJOR_MINOR) libivy.so
- cd $(DESTDIR)/usr/lib && ln -s libgivy.so.$(VERSION).$(MAJOR_MINOR) libgivy.so
- cd $(DESTDIR)/usr/X11R6/lib && ln -s libxtivy.so.$(VERSION).$(MAJOR_MINOR) libxtivy.so
+ install -m644 libivy.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
+ install -m644 libgivy.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
+ install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/X11R6/lib
+ cd $(DESTDIR)/usr/lib && ln -s libivy.so.$(MAJOR).$(MINOR) libivy.so
+ cd $(DESTDIR)/usr/lib && ln -s libgivy.so.$(MAJOR).$(MINOR) libgivy.so
+ cd $(DESTDIR)/usr/X11R6/lib && ln -s libxtivy.so.$(MAJOR).$(MINOR) libxtivy.so
install -m644 *.h $(DESTDIR)/usr/include