Changeset 26

Show
Ignore:
Timestamp:
04/29/08 13:32:52 (7 months ago)
Author:
jtang
Message:

Simplify build system by merging bindings target into normal compile.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libsipc.spec

    r25 r26  
    2525 
    2626%build 
    27 make %{?_smp_mflags} 
    28 make JAVA_HOME="%{JAVA_HOME}" JFLAGS="%{JFLAGS}" binding 
     27make %{?_smp_mflags} JAVA_HOME="%{JAVA_HOME}" JFLAGS="%{JFLAGS}" 
    2928 
    3029%install 
    3130rm -rf ${RPM_BUILD_ROOT} 
    3231make DESTDIR=${RPM_BUILD_ROOT} PREFIX='$(DESTDIR)/usr' LIBDIR=${RPM_BUILD_ROOT}%{_libdir} install 
    33 make DESTDIR=${RPM_BUILD_ROOT} PREFIX='$(DESTDIR)/usr' LIBDIR=${RPM_BUILD_ROOT}%{_libdir} install-binding 
    3432# fix symlink so that it doesn't point into BuildRoot 
    3533ln -sf ../sipc/bindings/java/libsipc.jar ${RPM_BUILD_ROOT}/usr/share/java/libsipc.jar 

  • trunk/libsipc/Makefile

    r24 r26  
    1919 
    2020export PREFIX INCLUDEDIR LIBDIR DATAROOTDIR MANDIR \ 
    21         CFLAGS LDFLAGS INCLUDEDIRS LIBDIRS 
     21        CFLAGS LDFLAGS 
    2222 
    23 # Subdirectories which contain targets 
    2423SUBDIRS = src include bindings/java examples man tests 
    2524 
    …… 
    3534        $(MAKE) -C tests $@ 
    3635 
    37 binding: 
    38         $(MAKE) -C bindings/java $@ 
    39  
    4036install: 
    4137        for i in $(SUBDIRS) ; do \ 
    …… 
    4541install-example: 
    4642        $(MAKE) -C examples $@ 
    47  
    48 install-binding: 
    49         $(MAKE) -C bindings/java $@ 
    5043 
    5144javadoc: 
    …… 
    5750        done 
    5851 
    59 .phony: all example test binding install install-policy javadoc clean 
     52.phony: all example test install install-policy javadoc clean 

  • trunk/libsipc/bindings/java/Makefile

    r24 r26  
    88        com/tresys/sipc/SipcMqueue.java \ 
    99        com/tresys/sipc/SipcShm.java 
     10CLASSES = $(patsubst %.java,%.class,$(SRC)) 
    1011 
    11 CLASSES = $(patsubst %.java,%.class,$(SRC)) 
    1212JAVA_HOME ?= /usr/java/default 
    1313JAVAC ?= $(JAVA_HOME)/bin/javac 
    1414JAR ?= $(JAVA_HOME)/bin/jar 
     15JAVADOC ?= %(JAVA_HOME)/bin/javadoc 
     16 
     17TOP_SRCDIR ?= ../.. 
     18TOP_BUILDDIR ?= ../.. 
     19INCLUDEDIRS = -I$(TOP_SRCDIR)/include 
     20LIBDIRS = -L$(TOP_BUILDDIR)/src 
    1521 
    1622# Change the following to be appropriate for your system: 
    …… 
    2834OBJS = sipc_wrap.o 
    2935 
    30 all: 
     36all: libsipc.jar $(LIBSO) 
    3137 
    32 binding: libsipc.jar $(LIBSO) 
    33  
    34 install-binding: 
     38install: 
    3539        test -d $(BINDINGSDIR) || install -m 755 -d $(BINDINGSDIR) 
    3640        test -d $(BINDINGSDIR)/examples || install -m 755 -d $(BINDINGSDIR)/examples 
    …… 
    5761        $(CC) $(CFLAGS) $(INCLUDEDIRS) $(JNI_CFLAGS) -fPIC -c -o $@ $< 
    5862 
    59 install: 
    60  
    6163javadoc: 
    62         javadoc -d javadoc com.tresys.sipc 
     64        $(JAVADOC) -d javadoc com.tresys.sipc 
    6365 
    6466clean: 

  • trunk/libsipc/examples/Makefile

    r21 r26  
    2121        shm_creator shm_destroyer shm_sender shm_reader 
    2222EXAMPLESDIR = $(DATAROOTDIR)/sipc 
     23 
     24TOP_SRCDIR ?= .. 
     25INCLUDEDIRS = -I$(TOP_SRCDIR)/include 
     26TOP_BUILDDIR ?= .. 
     27LIBDIRS = -L$(TOP_BUILDDIR)/src 
    2328 
    2429SUBDIRS = policy 
    …… 
    8590        done 
    8691 
    87 .phony: all install clean examples 
     92.phony: all install clean install-examples 

  • trunk/libsipc/src/Makefile

    r20 r26  
    33TARGET=libsipc.so 
    44LIBSO=$(TARGET).$(LIBVERSION) 
     5 
     6TOP_SRCDIR ?= .. 
     7INCLUDEDIRS = -I$(TOP_SRCDIR)/include 
    58 
    69OBJS=$(patsubst %.c,%.o,$(wildcard *.c))