Commit e39c1d3975438a3d00b64b1de820e1ce7d59bcc8
1 parent
38ac9f16
Exists in
master
and in
5 other branches
Remodelando Makefiles.
Showing
1 changed file
with
48 additions
and
5 deletions
Show diff stats
src/pw3270/Makefile.in
@@ -26,7 +26,9 @@ | @@ -26,7 +26,9 @@ | ||
26 | 26 | ||
27 | LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@ | 27 | LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@ |
28 | 28 | ||
29 | -LIB_SOURCES=window.c actions.c fonts.c dialog.c hostdialog.c print.c colors.c | 29 | +LIB_SOURCES=window.c actions.c fonts.c dialog.c hostdialog.c print.c colors.c \ |
30 | + tools.c plugin.c trace.c | ||
31 | + | ||
30 | APP_SOURCES=main.c | 32 | APP_SOURCES=main.c |
31 | 33 | ||
32 | MODULES=v3270 uiparser v3270ft common | 34 | MODULES=v3270 uiparser v3270ft common |
@@ -40,8 +42,10 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ | @@ -40,8 +42,10 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ | ||
40 | prefix=@prefix@ | 42 | prefix=@prefix@ |
41 | exec_prefix=@exec_prefix@ | 43 | exec_prefix=@exec_prefix@ |
42 | bindir=@bindir@ | 44 | bindir=@bindir@ |
43 | -sbindir=@sbindir@ | ||
44 | libdir=@libdir@ | 45 | libdir=@libdir@ |
46 | +datarootdir=@datarootdir@ | ||
47 | +localedir=@localedir@ | ||
48 | +desktopdir=$(datarootdir)/applications | ||
45 | 49 | ||
46 | BASEDIR=@BASEDIR@ | 50 | BASEDIR=@BASEDIR@ |
47 | 51 | ||
@@ -66,7 +70,13 @@ MKDIR=@MKDIR_P@ | @@ -66,7 +70,13 @@ MKDIR=@MKDIR_P@ | ||
66 | CC=@CC@ | 70 | CC=@CC@ |
67 | LD=@CC@ | 71 | LD=@CC@ |
68 | 72 | ||
69 | -CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @LIBSSL_CFLAGS@ @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270 | 73 | +CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \ |
74 | + -Wno-deprecated-declarations \ | ||
75 | + @LIBSSL_CFLAGS@ @GTK_CFLAGS@ \ | ||
76 | + -I$(BASEDIR)/src/include/pw3270 \ | ||
77 | + -DLIBDIR=\"$(libdir)\" \ | ||
78 | + -DDATAROOTDIR=\"$(datarootdir)\" | ||
79 | + | ||
70 | LIBS=@LIBS@ @LIBSSL_LIBS@ @GTK_LIBS@ @LIB3270_LIBS@ | 80 | LIBS=@LIBS@ @LIBSSL_LIBS@ @GTK_LIBS@ @LIB3270_LIBS@ |
71 | LDFLAGS=@LDFLAGS@ | 81 | LDFLAGS=@LDFLAGS@ |
72 | 82 | ||
@@ -106,18 +116,51 @@ $(OBJRLS)/%.o: \ | @@ -106,18 +116,51 @@ $(OBJRLS)/%.o: \ | ||
106 | 116 | ||
107 | #---[ Release Targets ]------------------------------------------------------------------ | 117 | #---[ Release Targets ]------------------------------------------------------------------ |
108 | 118 | ||
119 | +all: \ | ||
120 | + Release | ||
121 | + | ||
122 | +Release: \ | ||
123 | + $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) | ||
124 | + | ||
125 | +$(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): \ | ||
126 | + $(BINRLS)/$(LIBNAME) \ | ||
127 | + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) | ||
128 | + | ||
129 | + @$(LD) -o $@ $^ -L$(BINRLS) $(LIBS) -l@PACKAGE_TARNAME@ | ||
130 | + | ||
131 | +$(BINRLS)/$(LIBNAME): \ | ||
132 | + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ | ||
133 | + | ||
134 | + @echo $(basename $@) ... | ||
135 | + @$(MKDIR) `dirname $@` | ||
136 | + @$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $@ | ||
137 | + | ||
138 | +$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ | ||
139 | + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ | ||
140 | + | ||
141 | + @echo $(basename $@) ... | ||
142 | + @$(MKDIR) `dirname $@` | ||
143 | + @$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $@ | ||
144 | + | ||
145 | +$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | ||
146 | + $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC).o) \ | ||
147 | + $(foreach MOD, $(MODULES), $(BASEDIR)/.obj/Debug/$(MOD).a) | ||
148 | + | ||
149 | + @echo $(basename $@) ... | ||
150 | + @$(MKDIR) `dirname $@` | ||
151 | + @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS) | ||
152 | + | ||
109 | 153 | ||
110 | #---[ Debug Targets ]-------------------------------------------------------------------- | 154 | #---[ Debug Targets ]-------------------------------------------------------------------- |
111 | 155 | ||
112 | Debug: \ | 156 | Debug: \ |
113 | $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT) | 157 | $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT) |
114 | 158 | ||
115 | - | ||
116 | $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): \ | 159 | $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): \ |
117 | $(BINDBG)/$(LIBNAME) \ | 160 | $(BINDBG)/$(LIBNAME) \ |
118 | $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) | 161 | $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) |
119 | 162 | ||
120 | - $(LD) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@ | 163 | + @$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@ |
121 | 164 | ||
122 | $(BINDBG)/$(LIBNAME): \ | 165 | $(BINDBG)/$(LIBNAME): \ |
123 | $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ | 166 | $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ |