Commit 97036b41647a4aff856807608bf40b565388532f
1 parent
d7cf40b5
Exists in
master
and in
5 other branches
Separando subpacotes
Showing
3 changed files
with
46 additions
and
12 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -137,8 +137,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean $(PACKAGE_NAME).png $(PACKAG |
| 137 | 137 | @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) |
| 138 | 138 | @echo $@ |
| 139 | 139 | |
| 140 | -install: $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png | |
| 141 | - @make BINRLS="../../.bin/Release/lib" -C src/lib3270 install | |
| 140 | +install: install-sdk install-lib $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png | |
| 142 | 141 | @make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install |
| 143 | 142 | |
| 144 | 143 | @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui |
| ... | ... | @@ -146,6 +145,16 @@ install: $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png |
| 146 | 145 | @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) |
| 147 | 146 | @$(INSTALL_DATA) $(PACKAGE_NAME)-logo.png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) |
| 148 | 147 | |
| 148 | +install-lib: | |
| 149 | + @make BINRLS="../../.bin/Release/lib" -C src/lib3270 install | |
| 150 | + | |
| 151 | +install-sdk: | |
| 152 | + @$(MKDIR) $(DESTDIR)$(includedir)/lib3270 | |
| 153 | + @$(INSTALL_DATA) src/include/lib3270.h $(DESTDIR)/$(includedir) | |
| 154 | + @$(INSTALL_DATA) src/include/lib3270/config.h $(DESTDIR)/$(includedir)/lib3270 | |
| 155 | + @$(INSTALL_DATA) src/include/lib3270/selection.h $(DESTDIR)/$(includedir)/lib3270 | |
| 156 | + @$(INSTALL_DATA) src/include/pw3270.h $(DESTDIR)/$(includedir)/$(PACKAGE_NAME).h | |
| 157 | + | |
| 149 | 158 | clean: |
| 150 | 159 | @rm -fr .obj |
| 151 | 160 | @rm -fr .bin | ... | ... |
pw3270.cbp
| ... | ... | @@ -67,9 +67,6 @@ |
| 67 | 67 | <Unit filename="src/gtk/main.c"> |
| 68 | 68 | <Option compilerVar="CC" /> |
| 69 | 69 | </Unit> |
| 70 | - <Unit filename="src/gtk/mainwindow.c"> | |
| 71 | - <Option compilerVar="CC" /> | |
| 72 | - </Unit> | |
| 73 | 70 | <Unit filename="src/gtk/print.c"> |
| 74 | 71 | <Option compilerVar="CC" /> |
| 75 | 72 | </Unit> |
| ... | ... | @@ -117,9 +114,6 @@ |
| 117 | 114 | <Option compilerVar="CC" /> |
| 118 | 115 | </Unit> |
| 119 | 116 | <Unit filename="src/gtk/v3270/accessible.h" /> |
| 120 | - <Unit filename="src/gtk/v3270/clipboard.c"> | |
| 121 | - <Option compilerVar="CC" /> | |
| 122 | - </Unit> | |
| 123 | 117 | <Unit filename="src/gtk/v3270/draw.c"> |
| 124 | 118 | <Option compilerVar="CC" /> |
| 125 | 119 | </Unit> |
| ... | ... | @@ -137,12 +131,18 @@ |
| 137 | 131 | <Option compilerVar="CC" /> |
| 138 | 132 | </Unit> |
| 139 | 133 | <Unit filename="src/gtk/v3270/private.h" /> |
| 134 | + <Unit filename="src/gtk/v3270/selection.c"> | |
| 135 | + <Option compilerVar="CC" /> | |
| 136 | + </Unit> | |
| 140 | 137 | <Unit filename="src/gtk/v3270/sources.mak" /> |
| 141 | 138 | <Unit filename="src/gtk/v3270/v3270.h" /> |
| 142 | 139 | <Unit filename="src/gtk/v3270/widget.c"> |
| 143 | 140 | <Option compilerVar="CC" /> |
| 144 | 141 | </Unit> |
| 145 | 142 | <Unit filename="src/gtk/valgrind.suppression" /> |
| 143 | + <Unit filename="src/gtk/window.c"> | |
| 144 | + <Option compilerVar="CC" /> | |
| 145 | + </Unit> | |
| 146 | 146 | <Unit filename="src/include/lib3270.h" /> |
| 147 | 147 | <Unit filename="src/include/lib3270/action_table.h" /> |
| 148 | 148 | <Unit filename="src/include/lib3270/actions.h" /> | ... | ... |
pw3270.spec.in
| ... | ... | @@ -70,6 +70,26 @@ any IBM host that supports 3270-style connections over TELNET. |
| 70 | 70 | |
| 71 | 71 | Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ |
| 72 | 72 | |
| 73 | +%package lib | |
| 74 | +Summary: 3270 Communication library for %{name} | |
| 75 | +Group: Development/Libraries | |
| 76 | +Requires: openssl %{name}-lib | |
| 77 | + | |
| 78 | +%description lib | |
| 79 | +tn3270 protocol library for %{name} | |
| 80 | + | |
| 81 | +Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ | |
| 82 | + | |
| 83 | +%package devel | |
| 84 | +Summary: Devel for 3270 Communication library for %{name} | |
| 85 | +Group: Development/Libraries | |
| 86 | +Requires: %{name}-lib = @PACKAGE_VERSION@ | |
| 87 | + | |
| 88 | +%description devel | |
| 89 | +devel for tn3270 protocol library for %{name} | |
| 90 | + | |
| 91 | +Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ | |
| 92 | + | |
| 73 | 93 | #---[ Build & Install ]----------------------------------------------------------------------------------------------- |
| 74 | 94 | |
| 75 | 95 | %prep |
| ... | ... | @@ -98,19 +118,24 @@ rm -rf $RPM_BUILD_ROOT |
| 98 | 118 | %defattr(-,root,root) |
| 99 | 119 | %doc AUTHORS LICENSE |
| 100 | 120 | |
| 101 | -# Library | |
| 102 | -%{_libdir}/lib3270.so | |
| 103 | - | |
| 104 | 121 | # Main application |
| 105 | 122 | %dir %{_datadir}/@PACKAGE_NAME@ |
| 106 | 123 | %dir %{_datadir}/@PACKAGE_NAME@/ui |
| 107 | 124 | |
| 108 | 125 | %{_bindir}/@PACKAGE_NAME@ |
| 109 | 126 | %{_datadir}/@PACKAGE_NAME@/ui/00default.xml |
| 110 | -%{_datadir}/@PACKAGE_NAME@/ui/99debug.xml | |
| 111 | 127 | %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@.png |
| 112 | 128 | %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@-logo.png |
| 113 | 129 | |
| 130 | +%files lib | |
| 131 | +%defattr(-,root,root) | |
| 132 | +%{_libdir}/lib3270.so | |
| 133 | + | |
| 134 | +%files devel | |
| 135 | +%defattr(-,root,root) | |
| 136 | +%{_includedir} | |
| 137 | +%{_datadir}/@PACKAGE_NAME@/ui/99debug.xml | |
| 138 | + | |
| 114 | 139 | #---[ Scripts ]------------------------------------------------------------------------------------------------------- |
| 115 | 140 | |
| 116 | 141 | %post | ... | ... |