Hello Heiko, I really like to finish this build modification stage. Can you please review and apply?
Thanks, Alon. On Wed, Mar 28, 2012 at 2:05 PM, Alon Bar-Lev <alon.bar...@gmail.com> wrote: > > On Wed, Mar 28, 2012 at 1:59 PM, Alon Bar-Lev <alon.bar...@gmail.com> > wrote: > > 1. Rename resource includes to rch, see[1]. > > 2. Use implicit rule for resources. > > 3. Fixup resources build using automake conventions. > > 4. Misc cleanups > > > > [1] http://comments.gmane.org/gmane.comp.gnu.binutils/56459 > > > > Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com> > > --- > > Makefile.am | 51 ++++--- > > res/openvpn-gui-res-de.rc | 343 > > ------------------------------------------ > > res/openvpn-gui-res-de.rch | 343 > > ++++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-dk.rc | 342 > > ------------------------------------------ > > res/openvpn-gui-res-dk.rch | 342 > > ++++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-en.rc | 340 > > ----------------------------------------- > > res/openvpn-gui-res-en.rch | 340 > > +++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-es.rc | 339 > > ----------------------------------------- > > res/openvpn-gui-res-es.rch | 339 > > +++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-fi.rc | 357 > > -------------------------------------------- > > res/openvpn-gui-res-fi.rch | 357 > > ++++++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-fr.rc | 339 > > ----------------------------------------- > > res/openvpn-gui-res-fr.rch | 339 > > +++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-it.rc | 338 > > ----------------------------------------- > > res/openvpn-gui-res-it.rch | 338 > > +++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-jp.rc | 341 > > ------------------------------------------ > > res/openvpn-gui-res-jp.rch | 341 > > ++++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-nl.rc | 339 > > ----------------------------------------- > > res/openvpn-gui-res-nl.rch | 339 > > +++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-no.rc | 325 > > ---------------------------------------- > > res/openvpn-gui-res-no.rch | 325 > > ++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-pl.rc | 342 > > ------------------------------------------ > > res/openvpn-gui-res-pl.rch | 342 > > ++++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-pt.rc | 327 > > ---------------------------------------- > > res/openvpn-gui-res-pt.rch | 327 > > ++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-se.rc | 336 > > ----------------------------------------- > > res/openvpn-gui-res-se.rch | 336 > > +++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res-tr.rc | 341 > > ------------------------------------------ > > res/openvpn-gui-res-tr.rch | 341 > > ++++++++++++++++++++++++++++++++++++++++++ > > res/openvpn-gui-res.rc | 28 ++-- > > 30 files changed, 4791 insertions(+), 4786 deletions(-) > > create mode 100644 m4/.keep > > delete mode 100644 res/openvpn-gui-res-de.rc > > create mode 100644 res/openvpn-gui-res-de.rch > > delete mode 100644 res/openvpn-gui-res-dk.rc > > create mode 100644 res/openvpn-gui-res-dk.rch > > delete mode 100644 res/openvpn-gui-res-en.rc > > create mode 100644 res/openvpn-gui-res-en.rch > > delete mode 100644 res/openvpn-gui-res-es.rc > > create mode 100644 res/openvpn-gui-res-es.rch > > delete mode 100644 res/openvpn-gui-res-fi.rc > > create mode 100644 res/openvpn-gui-res-fi.rch > > delete mode 100644 res/openvpn-gui-res-fr.rc > > create mode 100644 res/openvpn-gui-res-fr.rch > > delete mode 100644 res/openvpn-gui-res-it.rc > > create mode 100644 res/openvpn-gui-res-it.rch > > delete mode 100644 res/openvpn-gui-res-jp.rc > > create mode 100644 res/openvpn-gui-res-jp.rch > > delete mode 100644 res/openvpn-gui-res-nl.rc > > create mode 100644 res/openvpn-gui-res-nl.rch > > delete mode 100644 res/openvpn-gui-res-no.rc > > create mode 100644 res/openvpn-gui-res-no.rch > > delete mode 100644 res/openvpn-gui-res-pl.rc > > create mode 100644 res/openvpn-gui-res-pl.rch > > delete mode 100644 res/openvpn-gui-res-pt.rc > > create mode 100644 res/openvpn-gui-res-pt.rch > > delete mode 100644 res/openvpn-gui-res-se.rc > > create mode 100644 res/openvpn-gui-res-se.rch > > delete mode 100644 res/openvpn-gui-res-tr.rc > > create mode 100644 res/openvpn-gui-res-tr.rch > > > > diff --git a/Makefile.am b/Makefile.am > > index c1753e0..349db19 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -18,8 +18,7 @@ > > # distribution); if not, write to the Free Software Foundation, Inc., > > # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > > > -RCCOMPILE = $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ > > - $(AM_CPPFLAGS) $(CPPFLAGS) > > +SUFFIXES = .rc > > > > AUTOMAKE_OPTIONS = foreign 1.9 > > > > @@ -31,6 +30,8 @@ MAINTAINERCLEANFILES = \ > > $(srcdir)/depcomp $(srcdir)/aclocal.m4 \ > > $(srcdir)/config.guess $(srcdir)/config.sub > > > > +EXTRA_DIST = .gitignore > > + > > bin_PROGRAMS = openvpn-gui > > > > dist_doc_DATA = \ > > @@ -42,21 +43,20 @@ AM_CPPFLAGS = -D_UNICODE > > AM_CFLAGS = -municode > > > > openvpn_gui_RESOURCES = \ > > - res/openvpn-gui-res.rc \ > > - res/openvpn-gui-res-de.rc \ > > - res/openvpn-gui-res-dk.rc \ > > - res/openvpn-gui-res-en.rc \ > > - res/openvpn-gui-res-es.rc \ > > - res/openvpn-gui-res-fi.rc \ > > - res/openvpn-gui-res-fr.rc \ > > - res/openvpn-gui-res-it.rc \ > > - res/openvpn-gui-res-jp.rc \ > > - res/openvpn-gui-res-nl.rc \ > > - res/openvpn-gui-res-no.rc \ > > - res/openvpn-gui-res-pl.rc \ > > - res/openvpn-gui-res-pt.rc \ > > - res/openvpn-gui-res-se.rc \ > > - res/openvpn-gui-res-tr.rc \ > > + res/openvpn-gui-res-de.rch \ > > + res/openvpn-gui-res-dk.rch \ > > + res/openvpn-gui-res-en.rch \ > > + res/openvpn-gui-res-es.rch \ > > + res/openvpn-gui-res-fi.rch \ > > + res/openvpn-gui-res-fr.rch \ > > + res/openvpn-gui-res-it.rch \ > > + res/openvpn-gui-res-jp.rch \ > > + res/openvpn-gui-res-nl.rch \ > > + res/openvpn-gui-res-no.rch \ > > + res/openvpn-gui-res-pl.rch \ > > + res/openvpn-gui-res-pt.rch \ > > + res/openvpn-gui-res-se.rch \ > > + res/openvpn-gui-res-tr.rch \ > > res/connected.ico \ > > res/connecting.ico \ > > res/disconnected.ico \ > > @@ -64,8 +64,6 @@ openvpn_gui_RESOURCES = \ > > res/reconnecting.ico \ > > res/openvpn-gui.manifest > > > > -EXTRA_DIST = $(openvpn_gui_RESOURCES) > > - > > openvpn_gui_SOURCES = \ > > main.c main.h \ > > openvpn.c openvpn.h \ > > @@ -82,14 +80,21 @@ openvpn_gui_SOURCES = \ > > openvpn_config.c \ > > openvpn_config.h \ > > chartable.h \ > > - openvpn-gui-res.h > > + openvpn-gui-res.h \ > > + res/openvpn-gui-res.rc \ > > + $(openvpn_gui_RESOURCES) > > > > -openvpn_gui_LDFLAGS = -mwindows > > openvpn_gui_LDADD = \ > > - openvpn-gui-res.o \ > > $(OPENSSL_CRYPTO_LIBS) \ > > -lws2_32 \ > > -lcomctl32 > > +openvpn_gui_LDFLAGS = \ > > + -mwindows > > + > > +$(srcdir)/res/openvpn-gui-res.rc: $(openvpn_gui_RESOURCES) > > $(srcdir)/openvpn-gui-res.h > > + touch "$(srcdir)/res/openvpn-gui-res.rc" > > > > -openvpn-gui-res.o: $(openvpn_gui_RESOURCES) $(srcdir)/openvpn-gui-res.h > > +RCCOMPILE = $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ > > + $(AM_CPPFLAGS) $(CPPFLAGS) > > +.rc.o: > > $(RCCOMPILE) -i $< -o $@ > > OK, too large for mailing list again... > Full patch is at[1]. > > Alon > > [1] > https://github.com/alonbl/openvpn-gui/commit/8ceead092ca498906f289042ae23991fb651ebe1
