pkgsrc/devel/newt/patches/patch-aa

$NetBSD: patch-aa,v 1.2 2008/04/13 09:54:42 wiz Exp $
--- Makefile.in.orig	2003-11-06 06:56:47.000000000 +0000
+++ Makefile.in
@@ -1,18 +1,16 @@
-LIBS = -lslang -lm #-lefence
-SHLIBS = -lslang -lm -lc
+LIBS = libnewt.la -lslang -lm -lpopt #-lefence
+SHLIBS = -lslang -lm -lc -lpopt
 
 GPM_SUPPORT=@gpm_support@
 
-CFLAGS = $(RPM_OPT_FLAGS) -Wall -I/usr/include/slang -D_GNU_SOURCE
-ifeq ($(RPM_OPT_FLAGS),)
-CFLAGS += -g 
-endif
+CFLAGS += -I${PREFIX}/include
+#LDFLAGS += -L${PREFIX}/lib -R${PREFIX}/lib
 
 VERSION = @VERSION@
 CVSTAG = r$(subst .,-,$(VERSION))
 SONAME = @SONAME@
 
-PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
+#PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
 
 WHIPTCLSO=
 #WHIPTCLSO=whiptcl.so
@@ -21,16 +19,16 @@ PROGS = test whiptail $(WHIPTCLSO) testg
 TESTOBJS = test.o
 NDIALOGOBJS = whiptail.o dialogboxes.o
 WHIPTCLOBJS = whiptcl.o dialogboxes.o
-LIBNEWT = libnewt.a
+LIBNEWT = libnewt.la
 LIBNEWTSH = libnewt.so.$(VERSION)
 LIBNEWTSONAME = libnewt.so.$(SONAME)
-LIBOBJS = newt.o button.o form.o checkbox.o entry.o label.o listbox.o \
+LIBOBJS = button.o form.o checkbox.o entry.o label.o listbox.o \
           scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
 	  checkboxtree.o
 
-SHCFLAGS = -fPIC
+#SHCFLAGS = ${CFLAGS} -fPIC
 
-prefix = /usr
+prefix = ${PREFIX}
 includedir = $(prefix)/include
 libdir = $(prefix)/lib
 bindir = $(prefix)/bin
@@ -38,6 +36,7 @@ ARCHNAME = $(shell uname -m | sed 's/i.8
 
 #--------------------------------------
 
+LIBSOURCES = $(subst .o,.c,$(LIBOBJS))
 SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
 
 SHAREDDIR = shared
@@ -49,43 +48,49 @@ else
 TARGET=depend $(PROGS)
 endif
 
-all:	$(TARGET) _snackmodule.so
+all:	$(TARGET)
+#all:	$(TARGET) _snackmodule.so
 
 test:	$(TESTOBJS) $(LIBNEWT)
-	gcc -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
+	${LIBTOOL} --mode=link ${CC} -g -o test $(TESTOBJS) $(LIBS) -static
 
 testgrid:	testgrid.o $(LIBNEWT)
-	gcc -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
+	${LIBTOOL} --mode=link ${CC} -g -o testgrid testgrid.o $(LIBS)
 
 testtree:	testtree.o $(LIBNEWT)
-	gcc -g -o testtree testtree.o $(LIBNEWT) $(LIBS)
+	${LIBTOOL} --mode=link ${CC} -g -o testtree testtree.o $(LIBS)
 
 showchars:	showchars.o $(LIBNEWT)
-	gcc -g -o showchars showchars.o $(LIBNEWT) $(LIBS)
+	${LIBTOOL} --mode=link ${CC} -g -o showchars showchars.o $(LIBS)
 
 showkey:	showkey.o $(LIBNEWT)
-	gcc -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
+	${LIBTOOL} --mode=link ${CC} -g -o showkey showkey.o $(LIBS)
 
 _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
 	for ver in $(PYTHONVERS) ; do \
 	    if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
 	    	mkdir -p $$ver ;\
-	        gcc $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
-		gcc --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
+	        ${CC} $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
+		${CC} --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
 	    fi ; \
 	done
 
-whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
-	gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
-
-whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
-	gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) -ltcl -lslang -lpopt -lm
+whiptail: $(NDIALOGOBJS) $(LIBNEWT)
+	${LIBTOOL} --mode=link ${CC} -g -o whiptail $(NDIALOGOBJS) $(LIBS)
 
-$(LIBNEWT): $(LIBOBJS)
-	ar rv $@ $^
+whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWT)
+	${LIBTOOL} --mode=link ${CC} -shared $(SHCFLAGS) -o whiptcl.so \
+	$(WHIPTCLOBJS) -ltcl ${LIBS}
+
+$(LIBNEWT): $(LIBOBJS) newt.o
+	${LIBTOOL} --mode=link ${CC} -o ${LIBNEWT} ${LIBOBJS:.o=.lo} \
+	newt.lo -rpath ${PREFIX}/lib -version-number 0:51:6 ${SHLIBS}
 
 newt.o: newt.c Makefile
-	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
+	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
+
+%.o: %.c
+	${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c -o $@ $<
 
 veryclean: clean
 	rm -f .depend
@@ -97,19 +102,19 @@ clean:
 depend:
 	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
 
-$(SHAREDDIR):
-	mkdir -p $(SHAREDDIR)
+#$(SHAREDDIR):
+#	mkdir -p $(SHAREDDIR)
 
-sharedlib: $(LIBNEWTSH)
+#sharedlib: $(LIBNEWTSH)
 
-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
-	gcc -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
+#$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
+#	${CC} -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
 
-$(SHAREDDIR)/%.o : %.c
-	$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
+#$(SHAREDDIR)/%.o : %.c
+#	$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
 
-$(SHAREDDIR)/newt.o: newt.c Makefile
-	$(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
+#$(SHAREDDIR)/newt.o: newt.c Makefile
+#	$(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
 
 
 install: $(LIBNEWT) install-sh whiptail
@@ -147,7 +152,3 @@ archive:    configure
 	@rm -f /tmp/newt-$(VERSION).tar.gz
 	@echo " "
 	@echo "The final archive is ./newt-$(VERSION).tar.gz."
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif