|
Lines 1-76
Link Here
|
| 1 |
--- Makefile.in.orig Tue Apr 23 06:51:55 2002 |
1 |
--- Makefile.in.orig Wed Feb 11 20:51:54 2004 |
| 2 |
+++ Makefile.in Sun Apr 28 13:09:35 2002 |
2 |
+++ Makefile.in Thu Mar 11 13:37:51 2004 |
| 3 |
@@ -1,14 +1,15 @@ |
3 |
@@ -117,7 +117,7 @@ |
| 4 |
# Unix |
4 |
|
|
|
5 |
MAINT_CHARSET = latin1 |
| 6 |
m4datadir = $(datadir)/aclocal |
| 7 |
-pkgconfigdatadir = $(prefix)/lib/pkgconfig |
| 8 |
+pkgconfigdatadir = $(prefix)/libdata/pkgconfig |
| 9 |
|
| 10 |
lib_LTLIBRARIES = libijs.la |
| 11 |
|
| 12 |
@@ -143,12 +143,12 @@ |
| 13 |
@SYSDEPS_WINDOWS_TRUE@libijs_la_LIBADD = ijs_exec_win.lo $(IJS_DEPLIBS) |
| 14 |
@SYSDEPS_WINDOWS_FALSE@libijs_la_LIBADD = ijs_exec_unix.lo $(IJS_DEPLIBS) |
| 15 |
# Uncommment to build an unversioned library (version in soname) |
| 16 |
-libijs_la_LDFLAGS = -release $(IJS_VERSION) -rpath $(libdir) |
| 17 |
+#libijs_la_LDFLAGS = -release $(IJS_VERSION) -rpath $(libdir) |
| 18 |
|
| 19 |
# Uncomment to build a versioned library |
| 20 |
-#libijs_la_LDFLAGS = \ |
| 21 |
-# -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ |
| 22 |
-# -rpath $(libdir) |
| 23 |
+libijs_la_LDFLAGS = \ |
| 24 |
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ |
| 25 |
+ -rpath $(libdir) |
| 26 |
ijs_client_example_SOURCES = ijs_client_example.c |
| 27 |
ijs_client_example_LDADD = libijs.la |
| 5 |
|
28 |
|
| 6 |
CC=@CC@ |
|
|
| 7 |
-CFLAGS=-g -Wall -ansi -pedantic -Wmissing-prototypes |
| 8 |
+CFLAGS=@CFLAGS@ -ansi -pedantic -Wmissing-prototypes |
| 9 |
LDLIBS= |
| 10 |
OBJ=.@OBJEXT@ |
| 11 |
EXE=@EXEEXT@ |
| 12 |
|
| 13 |
# todo: this needs to be .dylib on OS X - write a test |
| 14 |
-SHARED_LDFLAGS=-shared |
| 15 |
-SHARED_OBJ=.so |
| 16 |
+SHARED_LDFLAGS=-shared -Wl,-soname,libijs$(SHARED_OBJ) |
| 17 |
+SHARED_OBJ=.so.$(SHLIB_VER) |
| 18 |
+SHLIB_VER?=0 |
| 19 |
#SHARED_LDFLAGS=-dylib |
| 20 |
#SHARED_OBJ=.dylib |
| 21 |
|
| 22 |
@@ -28,11 +29,20 @@ |
| 23 |
|
| 24 |
pkgincludedir=$(includedir)/ijs |
| 25 |
|
| 26 |
-INSTALL = @INSTALL@ |
| 27 |
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
| 28 |
+INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
| 29 |
+INSTALL_DATA = @INSTALL_DATA@ |
| 30 |
|
| 31 |
IJS_COMMON_OBJ=ijs$(OBJ) |
| 32 |
|
| 33 |
-all: libijs.a libijs$(SHARED_OBJ) ijs_client_example$(EXE) ijs_server_example$(EXE) |
| 34 |
+.SUFFIXES: .c .lo .o |
| 35 |
+ |
| 36 |
+.c.o: |
| 37 |
+ $(CC) $(CFLAGS) -c -o $@ $< |
| 38 |
+.c.lo: |
| 39 |
+ $(CC) $(CFLAGS) -fPIC -DPIC -c -o $@ $< |
| 40 |
+ |
| 41 |
+all: libijs.a libijs$(SHARED_OBJ) ijs_client_example$(EXE) |
| 42 |
|
| 43 |
LIB_OBJS=ijs$(OBJ) ijs_client$(OBJ) ijs_server$(OBJ) $(IJS_EXEC_SERVER) |
| 44 |
|
| 45 |
@@ -44,7 +54,7 @@ |
| 46 |
# Note: this builds both the server and client into a single library. Logically, it |
| 47 |
# makes sense to separate them, but they're small enough to make this probably |
| 48 |
# not worthwhile. |
| 49 |
-libijs$(SHARED_OBJ): $(LIB_OBJS) |
| 50 |
+libijs$(SHARED_OBJ): $(LIB_OBJS:.o=.lo) |
| 51 |
$(CC) $(SHARED_LDFLAGS) $^ -o $@ |
| 52 |
|
| 53 |
ijs_client_example$(EXE): ijs_client_example$(OBJ) ijs_client$(OBJ) $(IJS_COMMON_OBJ) $(IJS_EXEC_SERVER) |
| 54 |
@@ -60,14 +70,15 @@ |
| 55 |
$(RM) *~ gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux libijs.a libijs$(SHARED_OBJ) config.cache config.log config.status ijs-config |
| 56 |
|
| 57 |
install: all |
| 58 |
- $(INSTALL) ijs_client_example$(EXE) -c $(bindir)/ijs_client_example$(EXE) |
| 59 |
- $(INSTALL) ijs-config -c $(bindir)/ijs-config |
| 60 |
- $(INSTALL) libijs.a $(libdir)/libijs.a |
| 61 |
- $(INSTALL) libijs$(SHARED_OBJ) $(libdir)/libijs$(SHARED_OBJ) |
| 62 |
+ $(INSTALL_PROGRAM) ijs_client_example$(EXE) $(bindir)/ijs_client_example$(EXE) |
| 63 |
+ $(INSTALL_SCRIPT) ijs-config $(bindir)/ijs-config |
| 64 |
+ $(INSTALL_DATA) libijs.a $(libdir)/libijs.a |
| 65 |
+ $(INSTALL_DATA) libijs$(SHARED_OBJ) $(libdir)/libijs$(SHARED_OBJ) |
| 66 |
+ -ln -sf libijs$(SHARED_OBJ) $(libdir)/libijs.so |
| 67 |
-mkdir $(pkgincludedir) |
| 68 |
- $(INSTALL) ijs.h $(pkgincludedir)/ijs.h |
| 69 |
- $(INSTALL) ijs_client.h $(pkgincludedir)/ijs_client.h |
| 70 |
- $(INSTALL) ijs_server.h $(pkgincludedir)/ijs_server.h |
| 71 |
+ $(INSTALL_DATA) ijs.h $(pkgincludedir)/ijs.h |
| 72 |
+ $(INSTALL_DATA) ijs_client.h $(pkgincludedir)/ijs_client.h |
| 73 |
+ $(INSTALL_DATA) ijs_server.h $(pkgincludedir)/ijs_server.h |
| 74 |
|
| 75 |
uninstall: |
| 76 |
$(RM) $(bindir)/ijs_client_example$(EXE) $(bindir)/ijs-config $(libdir)/libijs.a $(libdir)/libijs$(SHARED_OBJ) |