85a4f29865
-Get all files/* to use '-ur' flag with diff(1). Got dizzy without -ur. :-P Reported by: pointyhat-exp
52 lines
1.7 KiB
Text
52 lines
1.7 KiB
Text
--- book/Makefile.orig 1999-02-03 18:43:27.000000000 -0600
|
|
+++ book/Makefile 2009-07-12 11:11:05.000000000 -0500
|
|
@@ -12,13 +12,13 @@
|
|
|
|
# The library
|
|
XMHTMLINC= -I../lib
|
|
-XMHTMLLIB= -L../lib -lXmHTML
|
|
+XMHTMLLIB= ../lib/libXmHTML.la
|
|
LINKLIBS = $(XMHTMLLIB) $(LOADLIBES) $(DMALLOCLIB)
|
|
|
|
# rule to create .o files from .c files
|
|
.c.o:
|
|
$(RM) $@
|
|
- $(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
|
|
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(XMHTMLINC) $(INCLUDES) -c $<
|
|
|
|
all: $(EXAMPLES)
|
|
|
|
@@ -26,27 +26,27 @@
|
|
|
|
simple_html:: ../src/libXmHTML.a simple_html.o
|
|
$(RM) $@ \
|
|
- $(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html.o $(LINKLIBS)
|
|
|
|
simple_html2:: ../src/libXmHTML.a simple_html2.o
|
|
$(RM) $@ \
|
|
- $(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) simple_html2.o $(LINKLIBS)
|
|
|
|
autosize_html:: ../src/libXmHTML.a autosize_html.o
|
|
$(RM) $@ \
|
|
- $(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) autosize_html.o $(LINKLIBS)
|
|
|
|
forced_html:: ../src/libXmHTML.a forced_html.o
|
|
$(RM) $@ \
|
|
- $(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) forced_html.o $(LINKLIBS)
|
|
|
|
html:: ../src/libXmHTML.a html.o
|
|
$(RM) $@ \
|
|
- $(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html.o $(LINKLIBS)
|
|
|
|
html_browser:: ../src/libXmHTML.a html_browser.o
|
|
$(RM) $@ \
|
|
- $(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) html_browser.o $(LINKLIBS)
|
|
|
|
.PHONY: ../src/libXmHTML.a
|
|
|