annotate Makefile.in @ 2234:b569023edb6f

Mac: Fix display of MLE after toggling word wrap on, without having to resize the window.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 04 Jan 2021 12:33:20 +0000
parents 9f336ce185fd
children 8a12b4caf6b9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
1 srcdir=@srcdir@
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
2 mandir=@mandir@
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3 CC = @CC@
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
4 PLATCCFLAGS = @PLATCCFLAGS@
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
5 MLFLAGS = -L.
1901
6923871d0048 Makefile fix from Mark Hessling...also conditionally
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1851
diff changeset
6 include $(srcdir)/Version
1351
751f127439f7 Changes to the build system to no longer use the version during configure.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1160
diff changeset
7 CCFLAGS = @CFLAGS@ $(PLATCCFLAGS) @ARCH@ -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES -DVER_REV=$(VER_REV)
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
8 LFLAGS = @LIBS@ @ARCH@
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
9 ARFLAGS = @ARFLAGS@
41
af0a78aa0d45 More updates, and a more comprehensive unix install scheme. Use target
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 3
diff changeset
10 INSTALL = @INSTALL@
412
a8015e02b590 Initial configure support for MacOS X.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 396
diff changeset
11 DW_SRC = @DW_SRC@
662
d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 646
diff changeset
12 DW_DIR = @DW_DIR@
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
13 INCPATH = -I.. -I. -I$(srcdir)
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
14 TARGET = @TARGET@
878
4f1228efbdca Switched to realpath() instead of rel2abs() for GTK1/2 for now also.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 761
diff changeset
15 SRCS = $(srcdir)/$(DW_DIR)/$(DW_SRC)
636
f6f887d2c5aa Add _dw_log() internal logging function
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 629
diff changeset
16 BROWSER_OBJECT=@BROWSER_OBJECT@
2111
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
17 COMPAT_OBJECT =@COMPAT_OBJECT@
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
18 INSTALL_COMPAT=@INSTALL_COMPAT@
2111
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
19 INSTALL_TEST =@INSTALL_TEST@
878
4f1228efbdca Switched to realpath() instead of rel2abs() for GTK1/2 for now also.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 761
diff changeset
20 OBJECTS = dw.o $(BROWSER_OBJECT)
1594
6baf177f335c Rename compat.c/h dwcompat.c/h and configure option to --with-dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1369
diff changeset
21 SRCS2 = $(srcdir)dwcompat.c
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
22 OBJECTS2= $(COMPAT_OBJECT)
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
23 TARGET2= @TARGET2@
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
24 TARGETS = @TARGETS@
1351
751f127439f7 Changes to the build system to no longer use the version during configure.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1160
diff changeset
25 VER_MAJ = $(DW_MAJOR_VERSION)
751f127439f7 Changes to the build system to no longer use the version during configure.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1160
diff changeset
26 VER_MIN = $(DW_MINOR_VERSION)
1160
924c8087a755 Attempt to use the subversion revision number as the sub version number.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1114
diff changeset
27 VER_REV = @SVNVERSION@
434
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 432
diff changeset
28 SOSUFFIX= @SOSUFFIX@
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
29 SONAME= @SONAME@
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
30 LIBPREFIX = @LIBPREFIX@
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
31 LIBSUFFIX = @LIBSUFFIX@
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
32 prefix = $(DESTDIR)@prefix@
261
3087f7da0515 Change the order of header file includes; ensure local files are found first.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 250
diff changeset
33 SRCDIR=dwindows-$(VER_MAJ).$(VER_MIN)
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
34
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
35 #.SUFFIXES: .c .h
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
36
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
37 #.c.o:
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
38 # $(CC) -c $(CCFLAGS) $(INCPATH) -o $@ $<
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
39
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
40
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
41 # Link flags shared objects
432
5f9f185e4aa0 Wrong predicate on SHAREDFLAGS.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 430
diff changeset
42 SYSCONF_LFLAGS_SHOBJ = @SHAREDFLAG@
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
43
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
44 # Linking shared libraries
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
45 # - Build the $(TARGET) library, eg. lib$(TARGET).so.0.0
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
46 # - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
47 #
2029
10ca3e9d199f Remove hardcoded "gcc" to fix building on systems without gcc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1901
diff changeset
48 SYSCONF_LINK_SHLIB = @CC@
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
49 SYSCONF_LINK_TARGET_SHARED = @SYSCONF_LINK_TARGET_SHARED@
430
636a8a19f6c8 Condifure and Makefile changes for MacOS X.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 428
diff changeset
50 SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
51 -o $(SYSCONF_LINK_TARGET_SHARED) \
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
52 $(OBJECTS) $(LFLAGS) $(SONAME); \
434
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 432
diff changeset
53 rm -f lib$(TARGET).$(SOSUFFIX) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ); \
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 432
diff changeset
54 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 432
diff changeset
55 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
56
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
57 SYSCONF_LINK_TARGET_SHARED2 = @SYSCONF_LINK_TARGET_SHARED2@
430
636a8a19f6c8 Condifure and Makefile changes for MacOS X.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 428
diff changeset
58 SYSCONF_LINK_LIB_SHARED2 = $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
59 -o $(SYSCONF_LINK_TARGET_SHARED2) \
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
60 $(OBJECTS2) $(LFLAGS); \
434
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 432
diff changeset
61 rm -f lib$(TARGET2).$(SOSUFFIX) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ); \
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 432
diff changeset
62 ln -s $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX); \
062ed9ddf3af Shared library updates for MacOS X. Suffix should be dylib, and linker
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 432
diff changeset
63 ln -s $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ)
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
64
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
65
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
66 # Linking static libraries
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
67 # - Build the $(TARGET) library, eg. lib$(TARGET).a
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
68 #
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
69 SYSCONF_AR = ar $(ARFLAGS)
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
70 SYSCONF_LINK_TARGET_STATIC = @SYSCONF_LINK_TARGET_STATIC@
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
71 SYSCONF_LINK_LIB_STATIC = rm -f $(SYSCONF_LINK_TARGET_STATIC) ; \
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
72 $(SYSCONF_AR) $(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS)
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
73
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
74
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
75
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
76 ####### Build rules
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
77
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
78 SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
79 SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
80
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
81 SYSCONF_LINK_TARGET2 = $(SYSCONF_LINK_TARGET_SHARED2)
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
82 SYSCONF_LINK_LIB2 = $(SYSCONF_LINK_LIB_SHARED2)
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
83
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
84 all: $(TARGETS) dwtest
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
85
2111
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
86 install: installbase $(INSTALL_COMPAT) $(INSTALL_TEST)
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
87
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
88 installbase: $(SYSCONF_LINK_TARGET)
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
89 $(INSTALL) -d $(prefix)/include; \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
90 $(INSTALL) -d $(prefix)/lib; \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
91 $(INSTALL) -d $(prefix)/bin; \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
92 $(INSTALL) -d $(prefix)/share/man/man1; \
1851
c14384f1077b Make sure pkgconfig directory exists before installing the .pc file.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1850
diff changeset
93 $(INSTALL) -d $(prefix)/lib/pkgconfig; \
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
94 $(INSTALL) $(srcdir)/dw.h $(prefix)/include; \
1758
517d6e3f4b88 Cause variable expansion to occur during install phase.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1612
diff changeset
95 sed -e 's/@DW_MAJOR_VERSION@/'$(VER_MAJ)'/' -e 's/@DW_MINOR_VERSION@/'$(VER_MIN)'/' -e 's/@DW_SUB_VERSION@/'$(VER_REV)'/' < dwindows-config1 > dwindows-config
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
96 $(INSTALL) dwindows-config $(prefix)/bin; \
1850
495793f9b503 Create a dwindows.pc during install to support pkg-config in
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1758
diff changeset
97 sed -e 's/@VERSION@/'$(VER_MAJ).$(VER_MIN).$(VER_REV)'/' < dwindows1.pc > dwindows.pc
495793f9b503 Create a dwindows.pc during install to support pkg-config in
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1758
diff changeset
98 $(INSTALL) dwindows.pc $(prefix)/lib/pkgconfig; \
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
99 $(INSTALL) $(srcdir)/dwindows-config.1 $(prefix)/share/man/man1; \
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
100 cd $(prefix)/share/man/man1; gzip -f -9 dwindows-config.1
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
101 $(INSTALL) $(SYSCONF_LINK_TARGET) $(prefix)/lib; \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
102 cd $(prefix)/lib; \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
103 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
104 ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
105 ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
106
2111
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
107 installdwtest: dwtest
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
108 $(INSTALL) -d $(prefix)/bin; \
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
109 $(INSTALL) -d $(prefix)/share/applications; \
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
110 $(INSTALL) dwtest $(prefix)/bin; \
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
111 $(INSTALL) org.dbsoft.dwindows.dwtest.desktop $(prefix)/share/applications/
37ce3e22ee1a GTK: Split installdwtest into a separate make rule and don't enable it when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2109
diff changeset
112
1594
6baf177f335c Rename compat.c/h dwcompat.c/h and configure option to --with-dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1369
diff changeset
113 installdwcompat: $(SYSCONF_LINK_TARGET2)
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
114 $(INSTALL) -d $(prefix)/lib; \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
115 $(INSTALL) $(SYSCONF_LINK_TARGET2) $(prefix)/lib; \
1594
6baf177f335c Rename compat.c/h dwcompat.c/h and configure option to --with-dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1369
diff changeset
116 $(INSTALL) $(srcdir)/dwcompat.h $(prefix)/include; \
2160
07f1366a724c Rename config.h(.in) to dwconfig.h and install it with dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2111
diff changeset
117 $(INSTALL) $(srcdir)/dwconfig.h $(prefix)/include; \
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
118 cd $(prefix)/lib; \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
119 rm -f lib$(TARGET2).$(SOSUFFIX) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ); \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
120 ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX); \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
121 ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ)
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
122
1369
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
123 uninstall:
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
124 rm -f $(prefix)/lib/lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ)
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
125 rm -f $(prefix)/lib/lib$(TARGET2).$(SOSUFFIX)
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
126 rm -f $(prefix)/lib/lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ).$(VER_MIN)
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
127 rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
128 rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX)
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
129 rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX).$(VER_MAJ).$(VER_MIN)
2109
068681933258 GTK: Add dwtest to install rules and a desktop link required for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2029
diff changeset
130 rm -f $(prefix)/lib/pkgconfig/dwindows.pc
1369
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
131 rm -f $(prefix)/bin/dwindows-config
2109
068681933258 GTK: Add dwtest to install rules and a desktop link required for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2029
diff changeset
132 rm -f $(prefix)/bin/dwtest
1594
6baf177f335c Rename compat.c/h dwcompat.c/h and configure option to --with-dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1369
diff changeset
133 rm -f $(prefix)/include/dwcompat.h
2160
07f1366a724c Rename config.h(.in) to dwconfig.h and install it with dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2111
diff changeset
134 rm -f $(prefix)/include/dwconfig.h
1369
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
135 rm -f $(prefix)/include/dw.h
2109
068681933258 GTK: Add dwtest to install rules and a desktop link required for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2029
diff changeset
136 rm -f $(prefix)/share/applications/org.dbsoft.dwindows.dwtest.desktop
1369
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
137 rm -f $(prefix)/share/man/man1/dwindows-config.1.gz
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
138
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
139 deb: dist
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
140 -rm -fr tmp
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
141 -mkdir tmp
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
142 (cd tmp;tar zxvf ../../$(srcdir)/$(SRCDIR).tar.gz;cd $(SRCDIR);dpkg-buildpackage -rfakeroot;cd ..;ls -l)
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
143
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
144 distclean: clean
2160
07f1366a724c Rename config.h(.in) to dwconfig.h and install it with dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2111
diff changeset
145 rm -f config.status config.log dwconfig.h
2109
068681933258 GTK: Add dwtest to install rules and a desktop link required for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2029
diff changeset
146 rm -f dwindows-config dwindows-config1 dwindows.pc dwindows1.pc
068681933258 GTK: Add dwtest to install rules and a desktop link required for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2029
diff changeset
147 rm -f org.dbsoft.dwindows.dwtest.desktop
068681933258 GTK: Add dwtest to install rules and a desktop link required for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2029
diff changeset
148 rm -f Makefile
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
149
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
150 clean:
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
151 rm -f *.$(SOSUFFIX)
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
152 rm -f *.$(SOSUFFIX).*
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
153 rm -f *.o
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
154 rm -f *~
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
155 rm -f *.a
662
d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 646
diff changeset
156 rm -f $(DW_DIR)/*.o
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
157 rm -f dwtest
2221
9f336ce185fd Update Unix make rules for clean and dist taking into account 3.1 changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
158 rm -rf dwtest.app
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
159
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
160 $(SYSCONF_LINK_TARGET2): $(OBJECTS2)
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
161 $(SYSCONF_LINK_LIB2)
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
162
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
163 $(SYSCONF_LINK_TARGET): $(OBJECTS)
3
ktk@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
164 $(SYSCONF_LINK_LIB)
193
efd4703450fa Build test application on Unix too... and also fixed GTK to allow
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 147
diff changeset
165
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
166 $(SYSCONF_LINK_TARGET_STATIC): $(OBJECTS)
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
167 $(SYSCONF_LINK_LIB_STATIC)
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
168
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
169 dw.o: $(srcdir)/$(DW_DIR)/$(DW_SRC) $(srcdir)/dw.h
662
d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 646
diff changeset
170 $(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_DIR)/$(DW_SRC)
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
171
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
172 browser.o: $(srcdir)/$(DW_DIR)/browser.cpp $(srcdir)/dw.h
662
d7badd5606ca Removed the Carbon source file, and changes to configure to build the Cocoa version.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 646
diff changeset
173 $(CXX) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_DIR)/browser.cpp
622
fb59f9eeeecd SUpport for embedded mozilla/firefox widget
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 609
diff changeset
174
1594
6baf177f335c Rename compat.c/h dwcompat.c/h and configure option to --with-dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1369
diff changeset
175 dwcompat.o: $(srcdir)/dwcompat.c
6baf177f335c Rename compat.c/h dwcompat.c/h and configure option to --with-dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1369
diff changeset
176 $(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/dwcompat.c
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
177
761
39d848c20c05 Support for building on QNX platforms
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 662
diff changeset
178 dwtest.o: $(srcdir)/dwtest.c $(srcdir)/dw.h
622
fb59f9eeeecd SUpport for embedded mozilla/firefox widget
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 609
diff changeset
179 $(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/dwtest.c
601
fe6490a13ed2 Simplify and link dwtest with locally built shared libraries
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 566
diff changeset
180
193
efd4703450fa Build test application on Unix too... and also fixed GTK to allow
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 147
diff changeset
181 dwtest: dwtest.o
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
182 $(CC) -o dwtest dwtest.o $(MLFLAGS) -l$(TARGET) $(LFLAGS)
639
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
183 -chmod +x $(srcdir)/mac/finishup.sh
06be879f5137 Support for building with GTK+ on Mac OSX
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 636
diff changeset
184 -$(srcdir)/mac/finishup.sh $(srcdir)
250
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
185
967b8cd9deb4 Add srcdir usage to allow building to be done from anywhere.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 193
diff changeset
186 zip:
1595
080b764e8982 Up version number to 2.3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1594
diff changeset
187 zip dwindows$(VER_MAJ)$(VER_MIN).zip $(srcdir)/license.txt $(srcdir)/makefile.* $(srcdir)/readme.txt $(srcdir)/*.c $(srcdir)/dw.h $(srcdir)/dwcompat.h \
1368
2726b72ec7c4 Updated the zip and dist rules to account for new file locations.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1351
diff changeset
188 $(srcdir)/win/*.def $(srcdir)/os2/*.def $(srcdir)/install.sh $(srcdir)/*.in $(srcdir)/configure \
1369
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
189 $(srcdir)/ac*.m4 $(srcdir)/dwindows-config.1 $(srcdir)/Version \
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
190 $(srcdir)/gtk/*.c $(srcdir)/gtk/*.cpp $(srcdir)/win/*.c $(srcdir)/os2/*.c $(srcdir)/win/*.txt $(srcdir)/os2/*.txt \
1368
2726b72ec7c4 Updated the zip and dist rules to account for new file locations.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1351
diff changeset
191 $(srcdir)/gtk/*.xpm $(srcdir)/win/*.ico $(srcdir)/os2/*.ico $(srcdir)/mac/*.png \
2726b72ec7c4 Updated the zip and dist rules to account for new file locations.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1351
diff changeset
192 $(srcdir)/mac/Info.plist $(srcdir)/mac/PkgInfo $(srcdir)/mac/*.m $(srcdir)/mac/finishup.sh \
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
193 $(srcdir)/platform/*.h \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
194 $(srcdir)/debian/control $(srcdir)/debian/rules $(srcdir)/debian/copyright $(srcdir)/debian/compat $(srcdir)/debian/changelog
261
3087f7da0515 Change the order of header file includes; ensure local files are found first.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 250
diff changeset
195
3087f7da0515 Change the order of header file includes; ensure local files are found first.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 250
diff changeset
196 dist:
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
197 (cd $(srcdir)/..;ln -sf dwindows $(SRCDIR))
1595
080b764e8982 Up version number to 2.3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1594
diff changeset
198 (cd $(srcdir)/..;tar -cvf - $(SRCDIR)/license.txt $(SRCDIR)/makefile.* $(SRCDIR)/readme.txt $(SRCDIR)/*.c $(SRCDIR)/dw.h $(SRCDIR)/dwcompat.h \
1369
960ea1ec245e Add an uninstall target.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1368
diff changeset
199 $(SRCDIR)/install.sh $(SRCDIR)/*.in $(SRCDIR)/configure $(SRCDIR)/Version \
2221
9f336ce185fd Update Unix make rules for clean and dist taking into account 3.1 changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
200 $(SRCDIR)/ac*.m4 $(SRCDIR)/dwindows-config.1 $(SRCDIR)/config.sub $(SRCDIR)/config.guess $(SRCDIR)/image/test.* \
9f336ce185fd Update Unix make rules for clean and dist taking into account 3.1 changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
201 $(SRCDIR)/win/*.c $(SRCDIR)/win/*.cpp $(SRCDIR)/win/*.manifest $(SRCDIR)/win/*.txt $(SRCDIR)/win/*.def $(SRCDIR)/win/*.ico $(SRCDIR)/win/*.rc \
9f336ce185fd Update Unix make rules for clean and dist taking into account 3.1 changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
202 $(SRCDIR)/os2/*.c $(SRCDIR)/os2/*.txt $(SRCDIR)/os2/*.def $(SRCDIR)/os2/*.ico \
9f336ce185fd Update Unix make rules for clean and dist taking into account 3.1 changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
203 $(SRCDIR)/gtk/*.c $(SRCDIR)/gtk3/*.c $(SRCDIR)/gtk/*.xpm \
1114
e3f0528f6c16 Minor changes to the dist rule in the Unix Makefile.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1033
diff changeset
204 $(SRCDIR)/mac/Info.plist $(SRCDIR)/mac/PkgInfo $(SRCDIR)/mac/*.m $(SRCDIR)/mac/finishup.sh $(SRCDIR)/mac/*.png \
643
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
205 $(SRCDIR)/debian/control $(SRCDIR)/debian/rules $(SRCDIR)/debian/copyright $(SRCDIR)/debian/compat $(SRCDIR)/debian/changelog \
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
206 $(SRCDIR)/platform/*.h | gzip > $(SRCDIR).tar.gz )
9ab89d89e6b4 Add dw_listview_insert()
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 641
diff changeset
207 (cd $(srcdir)/..;rm -f $(SRCDIR))