pier 01/09/16 16:59:27
Modified: webapp/lib Makefile.in
Log:
Removed dependancies on LibTool for compilation as it's broken on more
platforms than in the ones in which it works (I don't want to include all
libtool hacks used by APR).
Revision Changes Path
1.14 +47 -37 jakarta-tomcat-connectors/webapp/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 2001/08/06 20:23:43 1.13
+++ Makefile.in 2001/09/16 23:59:27 1.14
@@ -56,44 +56,54 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.13 2001/08/06 20:23:43 pier Exp $
+# @version $Id: Makefile.in,v 1.14 2001/09/16 23:59:27 pier Exp $
-include @SRCDIR@/Makedefs
+include @TGTDIR@/Makedefs
-OBJS = wa_main.lo wa_config.lo wa_request.lo
-PROVS = pr_info.lo \
- pr_warp.lo \
- pr_warp_packet.lo \
- pr_warp_network.lo \
- pr_warp_config.lo
-
-LIB = libwebapp.la
-
-all: pr_warp_defs.h $(LIB)
-
-$(LIB): $(OBJS) $(PROVS)
- @$(ECHO) Creating library $(LIB)
- @$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -static -o $(LIB) \
- $(OBJS) $(PROVS) 1> /dev/null
-
-pr_warp_defs.h: @SRCDIR@/java/Constants.java
- @$(ECHO) Generating pr_warp_defs.h
- @$(CAT) @SRCDIR@/java/Constants.java | \
- grep TYPE_ | \
- sed "s/public static final int/#define/g" | \
- sed "y/=;/ /" > pr_warp_defs.h
+SRCS = pr_info.c \
+ pr_warp.c \
+ pr_warp.h \
+ pr_warp_config.c \
+ pr_warp_network.c \
+ pr_warp_packet.c \
+ wa_config.c \
+ wa_main.c \
+ wa_request.c \
+
+OBJS = wa_main.o \
+ wa_config.o \
+ wa_request.o
+
+PROVS = pr_info.o \
+ pr_warp.o \
+ pr_warp_packet.o \
+ pr_warp_network.o \
+ pr_warp_config.o
+LIB = libwebapp.a
+
+WARPH = pr_warp_defs.h
+
+build: $(LIB)
+
clean:
- @for ENTRY in *.o *.lo $(LIB) pr_warp_defs.h .libs ; \
- do \
- if $(TEST) -f $${ENTRY} ; \
- then \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- fi ; \
- done
+ @$(MECHO) "Cleaning up"
+ @$(DEXEC) $(RM) -f $(OBJS) $(PROVS) $(LIB) $(WARPH)
+
+$(LIB): $(SRCS) $(WARPH) $(OBJS) $(PROVS)
+ @$(MECHO) "Creating library \"$@\""
+ @$(DEXEC) $(AR) cr $@ $(OBJS) $(PROVS)
+ @$(DEXEC) $(RANLIB) $@
+
+pr_warp_defs.h: $(SRCDIR)/java/Constants.java
+ @$(MECHO) "Generating \"$@\""
+ @$(CAT) "$<" | \
+ $(GREP) "TYPE_" | \
+ $(SED) "s/public static final int/#define/g" | \
+ $(SED) "y/=;/ /" > $@
+
+$(SRCS):
+ @$(MECHO) "Linking \"$@\""
+ @$(DEXEC) $(LN) -s $(SRCDIR)/lib/$@ ./$@
+
+
