diff options
| author | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2012-08-18 20:15:43 +0000 |
|---|---|---|
| committer | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2012-08-18 20:15:43 +0000 |
| commit | 88042ee35fedaca70f8724380bd06a182074b89c (patch) | |
| tree | 410603a4ecc47e5d3f0919f7ed4476991ba0fe01 /Makefile.am | |
| parent | cc3697470a75eaed71a49b7af4244c4038d738ae (diff) | |
| download | pica-pica-88042ee35fedaca70f8724380bd06a182074b89c.tar.gz pica-pica-88042ee35fedaca70f8724380bd06a182074b89c.zip | |
put pica-node executable in pica-node dir to avoid conflict (pica-node dir and pica-node executable in same top_srcdir)
git-svn-id: svn://localhost/project_picapica/trunk@167 fb96df88-216d-11de-830c-f3023f12d8ac
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index d622fbb..d3e7708 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,9 +37,9 @@ EXTRA_DIST += nodelist_db_create.sql endif ##################################### if PICA_CLIENT -bin_PROGRAMS += pica-client +bin_PROGRAMS += pica-client/pica-client -pica_client_SOURCES = \ +pica_client_pica_client_SOURCES = \ pica-client/accounts.cpp \ pica-client/accounts.h \ pica-client/accountswindow.cpp \ @@ -87,7 +87,7 @@ PICA_msgproc.c \ PICA_msgproc.h \ PICA_common.h PICA_proto.h -nodist_pica_client_SOURCES = \ +nodist_pica_client_pica_client_SOURCES = \ moc_accountswindow.cpp \ moc_addaccountdialog.cpp \ moc_askpassword.cpp \ @@ -119,8 +119,8 @@ ui_%.h: pica-client/%.ui uic $(CPPFLAGS) $< -o $@ -pica_client_CPPFLAGS = -DPICA_INSTALLPREFIX=\"$(prefix)\" $(QT_DEPENDENCIES_CFLAGS) -pica_client_LDADD = $(QT_DEPENDENCIES_LIBS) +pica_client_pica_client_CPPFLAGS = -DPICA_INSTALLPREFIX=\"$(prefix)\" $(QT_DEPENDENCIES_CFLAGS) +pica_client_pica_client_LDADD = $(QT_DEPENDENCIES_LIBS) dist_pkgdata_DATA += pica-client/picapica-icon-fly.png pica-client/picapica-icon-sit.png |