Mercurial > dwindows

diff Makefile.in @ 643:9ab89d89e6b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add dw_listview_insert() Default to using webkit for Gtk+ HTML widget Add option to build with libgtkhtml2 - incomplete Initial attempt to use customdraw for Win32 container - not working Added dw_window_get_font() for Gtk+ - not implemented in other ports yet Change package name from dw to dwindows for Linux ports - use dwindows-config now Add debian package build target
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 03 Oct 2010 00:34:36 +0000
parents 54e7cd9c98ee
children 5ea195fd28da
line wrap: on
line diff
--- a/Makefile.in	Sun Apr 12 01:41:50 2009 +0000
+++ b/Makefile.in	Sun Oct 03 00:34:36 2010 +0000
@@ -1,12 +1,13 @@
 srcdir=@srcdir@
+mandir=@mandir@
 CC	=	@CC@
 MLFLAGS	=	-L.
-CCFLAGS	=	@CFLAGS@ -g -O2 -fPIC -Wall -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES
-LFLAGS	=	@LIBS@
+CCFLAGS	=	@CFLAGS@ -g -O2 @ARCH@ -fPIC -Wall -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES
+LFLAGS	=	@LIBS@ @ARCH@
 INSTALL =	@INSTALL@
 DW_SRC  =	@DW_SRC@
 INCPATH	=	-I.. -I. -I$(srcdir)
-TARGET	=	dw
+TARGET	=	@TARGET@
 SRCS	=	$(srcdir)/$(DW_SRC)/dw.c $(DW_SRC)rel2abs.c
 BROWSER_OBJECT=@BROWSER_OBJECT@
 COMPAT_OBJECT=@COMPAT_OBJECT@
@@ -14,11 +15,12 @@
 OBJECTS	=	dw.o rel2abs.o $(BROWSER_OBJECT)
 SRCS2	=	$(srcdir)compat.c
 OBJECTS2=	$(COMPAT_OBJECT)
-TARGET2 =	dwcompat
+TARGET2=	@TARGET2@
 VER_MAJ	=	@DW_MAJOR_VERSION@
 VER_MIN	=	@DW_MINOR_VERSION@
 SOSUFFIX=	@SOSUFFIX@
-PREFIX	=	$(DESTDIR)@prefix@
+SONAME=	@SONAME@
+prefix	=	$(DESTDIR)@prefix@
 SRCDIR=dwindows-$(VER_MAJ).$(VER_MIN)
 
 #.SUFFIXES:	.c .h
@@ -38,7 +40,7 @@
 SYSCONF_LINK_TARGET_SHARED = @SYSCONF_LINK_TARGET_SHARED@
 SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \
 				     -o $(SYSCONF_LINK_TARGET_SHARED) \
-				     $(OBJECTS) $(LFLAGS); \
+				     $(OBJECTS) $(LFLAGS) $(SONAME); \
 				 rm -f lib$(TARGET).$(SOSUFFIX) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ); \
 				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \
 				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
@@ -75,32 +77,44 @@
 install: installbase $(INSTALL_COMPAT)
 
 installbase: $(SYSCONF_LINK_TARGET)
-		$(INSTALL) -d $(PREFIX)/include; \
-		$(INSTALL) -d $(PREFIX)/bin; \
-		$(INSTALL) -d $(PREFIX)/lib; \
-		$(INSTALL) $(srcdir)/dw.h $(PREFIX)/include; \
-		$(INSTALL) dw-config $(PREFIX)/bin; \
-		$(INSTALL) dwtest $(PREFIX)/bin; \
-		$(INSTALL) $(SYSCONF_LINK_TARGET)  $(PREFIX)/lib; \
-		cd $(PREFIX)/lib; \
-		rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
-		ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \
-		ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
+	$(INSTALL) -d $(prefix)/include; \
+	$(INSTALL) -d $(prefix)/lib; \
+	$(INSTALL) -d $(prefix)/bin; \
+	$(INSTALL) -d $(prefix)/share/man/man1; \
+	$(INSTALL) $(srcdir)/dw.h $(prefix)/include; \
+	$(INSTALL) dwindows-config $(prefix)/bin; \
+	$(INSTALL) dwindows-config.1 $(prefix)/share/man/man1; \
+	cd $(prefix)/share/man/man1; gzip -f -9 dwindows-config.1
+	$(INSTALL) $(SYSCONF_LINK_TARGET)  $(prefix)/lib; \
+	cd $(prefix)/lib; \
+	rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
+	ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \
+	ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
 
 installcompat: $(SYSCONF_LINK_TARGET2)
-		$(INSTALL) -d $(PREFIX)/lib; \
-		$(INSTALL) $(SYSCONF_LINK_TARGET2) $(PREFIX)/lib; \
-		cd $(PREFIX)/lib; \
-		rm -f lib$(TARGET2).$(SOSUFFIX) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ); \
-		ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX); \
-		ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ)
+	$(INSTALL) -d $(prefix)/lib; \
+	$(INSTALL) $(SYSCONF_LINK_TARGET2) $(prefix)/lib; \
+	cd $(prefix)/lib; \
+	rm -f lib$(TARGET2).$(SOSUFFIX) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ); \
+	ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX); \
+	ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ)
+
+deb: dist
+	-rm -fr tmp
+	-mkdir tmp
+	(cd tmp;tar zxvf ../../$(srcdir)/$(SRCDIR).tar.gz;cd $(SRCDIR);dpkg-buildpackage -rfakeroot;cd ..;ls -l)
+
+distclean: clean
+	rm -f config.status
 
 clean:
 	rm -f *.$(SOSUFFIX)
+	rm -f *.$(SOSUFFIX).*
 	rm -f *.o
 	rm -f *~
 	rm -f *.a
 	rm -f $(DW_SRC)/*.o
+	rm -f dwtest
 
 $(SYSCONF_LINK_TARGET2): $(OBJECTS2)
 	$(SYSCONF_LINK_LIB2)
@@ -124,24 +138,28 @@
 	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/dwtest.c
 
 dwtest: dwtest.o
-	$(CC) -o dwtest dwtest.o $(MLFLAGS) -ldw $(LFLAGS)
+	$(CC) -o dwtest dwtest.o $(MLFLAGS) -l$(TARGET) $(LFLAGS)
 	-chmod +x $(srcdir)/mac/finishup.sh
 	-$(srcdir)/mac/finishup.sh $(srcdir)
 
 zip:
 	zip dwindows$(VER_MAJ)$(VER_MIN).zip $(srcdir)/license.txt $(srcdir)/makefile.* $(srcdir)/readme $(srcdir)/*.c $(srcdir)/dw.h  $(srcdir)/compat.h \
-		$(srcdir)/*.def $(srcdir)/install.sh $(srcdir)/*.in $(srcdir)/configure \
-		$(srcdir)/ac*.m4 \
-		$(srcdir)/gtk/*.c $(srcdir)/win/*.c $(srcdir)/os2/*.c $(srcdir)/win/*.txt $(srcdir)/os2/*.txt \
-		$(srcdir)/gtk/*.xpm $(srcdir)/win/*.ico $(srcdir)/os2/*.ico \
-		$(srcdir)/mac/Info.plist $(srcdir)/mac/PkgInfo $(srcdir)/mac/*.c $(srcdir)/mac/dwtest.r $(srcdir)/mac/finishup.sh \
-		$(srcdir)/platform/*.h
+	$(srcdir)/*.def $(srcdir)/install.sh $(srcdir)/*.in $(srcdir)/configure \
+	$(srcdir)/ac*.m4 $(srcdir)/dwindows-config.1 \
+	$(srcdir)/gtk/*.c $(srcdir)/gtk/*.cpp $(srcdir)/win/*.c $(srcdir)/os2/*.c $(srcdir)/win/*.txt $(srcdir)/os2/*.txt \
+	$(srcdir)/gtk/*.xpm $(srcdir)/win/*.ico $(srcdir)/os2/*.ico \
+	$(srcdir)/mac/Info.plist $(srcdir)/mac/PkgInfo $(srcdir)/mac/*.c $(srcdir)/mac/dwtest.r $(srcdir)/mac/finishup.sh \
+	$(srcdir)/platform/*.h \
+	$(srcdir)/debian/control $(srcdir)/debian/rules $(srcdir)/debian/copyright $(srcdir)/debian/compat $(srcdir)/debian/changelog
 
 dist:
+	(cd $(srcdir)/..;ln -sf dwindows $(SRCDIR))
 	(cd $(srcdir)/..;tar -cvf - $(SRCDIR)/license.txt $(SRCDIR)/makefile.* $(SRCDIR)/readme $(SRCDIR)/*.c $(SRCDIR)/dw.h $(SRCDIR)/compat.h \
-		$(SRCDIR)/*.def $(SRCDIR)/install.sh $(SRCDIR)/*.in $(SRCDIR)/configure \
-		$(SRCDIR)/ac*.m4 \
-		$(SRCDIR)/gtk/*.c $(SRCDIR)/win/*.c $(SRCDIR)/os2/*.c  $(srcdir)/win/*.txt $(srcdir)/os2/*.txt \
-		$(SRCDIR)/gtk/*.xpm $(SRCDIR)/win/*.ico $(SRCDIR)/os2/*.ico \
-		$(SRCDIR)/mac/Info.plist $(SRCDIR)/mac/PkgInfo $(SRCDIR)/mac/*.c $(SRCDIR)/mac/dwtest.r $(SRCDIR)/mac/finishup.sh \
-		$(SRCDIR)/platform/*.h | gzip > dwindows-$(VER_MAJ).$(VER_MIN).tar.gz )
+	$(SRCDIR)/*.def $(SRCDIR)/install.sh $(SRCDIR)/*.in $(SRCDIR)/configure \
+	$(SRCDIR)/ac*.m4 $(SRCDIR)/dwindows-config.1 \
+	$(SRCDIR)/gtk/*.c $(SRCDIR)/gtk/*.cpp $(SRCDIR)/win/*.c $(SRCDIR)/os2/*.c  $(SRCDIR)/win/*.txt $(SRCDIR)/os2/*.txt \
+	$(SRCDIR)/gtk/*.xpm $(SRCDIR)/win/*.ico $(SRCDIR)/os2/*.ico \
+	$(SRCDIR)/mac/Info.plist $(SRCDIR)/mac/PkgInfo $(SRCDIR)/mac/*.c $(SRCDIR)/mac/dwtest.r $(SRCDIR)/mac/finishup.sh \
+	$(SRCDIR)/debian/control $(SRCDIR)/debian/rules $(SRCDIR)/debian/copyright $(SRCDIR)/debian/compat $(SRCDIR)/debian/changelog \
+	$(SRCDIR)/platform/*.h | gzip > $(SRCDIR).tar.gz )
+	(cd $(srcdir)/..;rm -f $(SRCDIR))