OSSP CVS Repository

ossp - Difference in ossp-pkg/js/Makefile.in versions 1.4 and 1.5
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [History] 

ossp-pkg/js/Makefile.in 1.4 -> 1.5 

--- Makefile.in  2006/07/22 15:02:07     1.4
+++ Makefile.in  2006/07/22 15:40:04     1.5
@@ -48,6 +48,7 @@
 LDFLAGS      = @LDFLAGS@
 LIBS         = @LIBS@
 
+CLI_CFLAGS   = @CLI_CFLAGS@
 CLI_CPPFLAGS = @CLI_CPPFLAGS@
 CLI_LDFLAGS  = @CLI_LDFLAGS@
 CLI_LIBS     = @CLI_LIBS@
@@ -57,6 +58,7 @@
 RMDIR        = rmdir
 SHTOOL       = ./shtool
 LIBTOOL      = ./libtool
+PERL         = @PERL@
 TRUE         = true
 
 LIB_HDR_API  = src/jsapi.h                 \
@@ -175,28 +177,41 @@
                src/fdlibm/w_log.lo         \
                src/fdlibm/w_pow.lo         \
                src/fdlibm/w_sqrt.lo
+LIB_NAME     = libjs.la
 
-TARGETS      = libjs.la js
+CLI_OBJS     = src/js.o @CLI_OBJS@
+CLI_NAME     = js
+
+WITH_PERL    = @WITH_PERL@
+
+TARGETS      = $(LIB_NAME) $(CLI_NAME) subdirs
 
 .SUFFIXES:
 .SUFFIXES: .c .o .lo
 
 all: $(TARGETS)
 
+subdirs:
+        @if [ ".$(WITH_PERL)" = ".yes" ]; then \
+            (cd src/perlconnect; $(PERL) Makefile.PL; $(MAKE) $(MFLAGS)); \
+        fi
+
 .c.o:
         $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
 .c.lo:
         @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
-libjs.la: $(LIB_OBJS)
-        @$(LIBTOOL) --mode=link $(CC) -o libjs.la $(LIB_OBJS) -rpath $(libdir) \
+$(LIB_NAME): $(LIB_OBJS)
+        @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
             -version-info `$(SHTOOL) version -l txt -d libtool VERSION`
 
-js: src/js.o
-        @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) -o js src/js.o libjs.la $(LIBS) $(CLI_LIBS)
+$(CLI_NAME): $(CLI_OBJS)
+        @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS)
 src/js.o: src/js.c
-        $(CC) $(CPPFLAGS) $(CFLAGS) $(CLI_CPPFLAGS) -o $@ -c $<
+        $(CC) $(CPPFLAGS) $(CLI_CPPFLAGS) $(CFLAGS) $(CLI_CFLAGS) -o $@ -c $<
+src/perlconnect/jsperl.o: src/perlconnect/jsperl.c
+        $(CC) $(CPPFLAGS) $(CLI_CPPFLAGS) $(CFLAGS) $(CLI_CFLAGS) -o $@ -c $<
 
 $(LIB_OBJS): src/jsautocfg.h
 src/jsautocfg.h: jscpucfg
@@ -218,12 +233,15 @@
         $(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/
         $(SHTOOL) install -c -m 644 js.1 $(DESTDIR)$(mandir)/man1/
         $(SHTOOL) install -c -m 644 $(LIB_HDR_API) $(DESTDIR)$(includedir)/
-        @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libjs.la $(DESTDIR)$(libdir)/
+        @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
         $(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/
+        @if [ ".$(WITH_PERL)" = ".yes" ]; then \
+            (cd src/perlconnect; $(MAKE) $(MFLAGS) install); \
+        fi
 
 .PHONY: clean
 clean:
-        -$(RM) libjs.la $(LIB_OBJS)
+        -$(RM) $(LIB_NAME) $(LIB_OBJS)
         -$(RM) js src/js.o
         -$(RM) -r .libs >/dev/null 2>&1 || $(TRUE)
         -$(RM) *.o *.lo

CVSTrac 2.0.1