anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

further makefile work

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3944 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-04-08 09:42:58 +00:00
parent cbfd5fd8df
commit 78930d2d26
15 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am (bindist): new bindist target
2002-04-06 Lars Gullik Bjønnes <larsbj@birdstep.com>
* configure.in: make distcheck work

23
Makefile.am
View File

@ -35,26 +35,6 @@ rpmdist: dist
rm lyx.xpm; exit $$saved_status
bindist:
mkdir $(bindistdir)
if test -f README.bin ; then \
$(INSTALL) README.bin $(bindistdir)/README.bin ; \
fi
$(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
(cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
rm -rf $(bindistdir)
@if test -f README.bin ; then \
echo "*** Did you remember to check the contents of README.bin?" ; \
else \
echo "*** WARNING: You did not provide a README.bin file." ; \
echo "*** Please make one now from the example file" ; \
echo "*** development/tools/README.bin.example" ; \
fi
@echo "*** It should mention any problem concerning your binary"
@echo "*** distribution and refer to *you* in case of problem."
@echo "*** $(bindistfile) has been created."
newbindist:
rm -f $(bindistfile)
$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(bindistdir) install-strip
if test -f $(top_srcdir)/README.bin ; then \
@ -64,7 +44,7 @@ newbindist:
(cd $(bindistdir)$(prefix) ; $(AMTAR) cf - . ) | \
GZIP=$(GZIP_ENV) gzip > $(bindistfile)
-chmod -R a+w $(bindistdir) > /dev/null 2>&1 ; rm -rf $(bindistdir)
@if test -f README.bin ; then \
@if test -f $(top_srcdir)/README.bin ; then \
echo "*** Did you remember to check the contents of README.bin?" ; \
else \
echo "*** WARNING: You did not provide a README.bin file." ; \
@ -75,7 +55,6 @@ newbindist:
@echo "*** distribution and refer to *you* in case of problem."
@echo "*** $(bindistfile) has been created."
doxydoc: sourcedoc/Doxyfile
cd sourcedoc; \
doxygen ./Doxyfile

7
src/frontends/ChangeLog
View File

@ -1,3 +1,10 @@
2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am (DIST_SUBDIRS): use this instead of EXTRA_DIST
(EXTRA_DIST): delete
(dist-hook): delete
(distclean-local): delete
2002-04-06 Lars Gullik Bjřnnes <larsbj@birdstep.com>
* Makefile.am: make distcheck work

17
src/frontends/Makefile.am
View File

@ -2,14 +2,13 @@ include $(top_srcdir)/config/common.am
SUBDIRS = controllers @FRONTEND@
DIST_SUBDIRS = controllers xforms qt2 gnome
noinst_LTLIBRARIES = libfrontends.la
LIBS += @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/.. $(SIGC_CFLAGS) $(BOOST_INCLUDES)
EXTRA_DIST = xforms qt2 gnome
libfrontends_la_LIBADD = @FRONTEND_GUILIB@ controllers/*.lo
libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD)
@ -31,15 +30,3 @@ libfrontends_la_SOURCES = \
Timeout.h \
Toolbar.C \
Toolbar.h
dist-hook:
@cd $(distdir) ; \
rm -rf `find qt2 -name \*CVS\*`; \
rm -rf `find gnome -name \*CVS\*`
distclean-local:
for dir in $(EXTRA_DIST) ; do \
if test -f $$dir/Makefile ; then \
make -C $$dir distclean ; \
fi ; \
done

4
src/frontends/gnome/ChangeLog
View File

@ -1,3 +1,7 @@
2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am: change to work correctly with dist
2002-03-29 Michael A. Koziarski <michael@koziarski.com>
* GPreamble.C

29
src/frontends/gnome/Makefile.am
View File

@ -40,8 +40,7 @@ xforms_objects = \
../xforms/Toolbar_pimpl.lo \
../xforms/Tooltips.lo \
../xforms/xforms_helpers.lo \
../xforms/xformsBC.lo \
$(XFORMSGIMAGE)
../xforms/xformsBC.lo $(XFORMSGIMAGE)
libgnome.la: xforms.lo $(libgnome_la_OBJECTS) $(libgnome_la_DEPENDENCIES)
@ -53,7 +52,7 @@ xforms.lo: $(xforms_objects)
###
#LDFLAGS= $(libgnome_la_OBJADD)
LYXDATADIRS =
#LYXDATADIRS =
libgnome_la_SOURCES = \
Dialogs.C \
@ -98,15 +97,15 @@ libgnome_la_SOURCES = \
# GUI_applymenu.C
# just copied from old lyx repository
dist-hook:
for subdir in $(LYXDATADIRS) ; do \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
chmod 777 $(distdir)/$$subdir; \
list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \
echo $$list ; \
for fil in $$list ; do \
cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \
done ; \
done
#dist-hook:
# for subdir in $(LYXDATADIRS) ; do \
# test -d $(distdir)/$$subdir \
# || mkdir $(distdir)/$$subdir \
# || exit 1; \
# chmod 777 $(distdir)/$$subdir; \
# list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \
# echo $$list ; \
# for fil in $$list ; do \
# cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \
# done ; \
# done

21
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,24 @@
2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* xforms/Makefile.am (EXTRA_DIST): delete
(libqt2xforms_la_SOURCES): change to...
(nodist_libqt2xforms_la_SOURCES): this
* ui/moc/Makefile.am (libqt2uimoc_la_SOURCES): change to...
(nodist_libqt2uimoc_la_SOURCES): this
* ui/Makefile.am (libqt2ui_la_SOURCES): change to...
(nodist_libqt2ui_la_SOURCES): this
* moc/Makefile.am (libqtmoc_la_SOURCES): comment out
(nodist_libqt2moc_la_SOURCES): new
* Makefile.dialogs (DIALOGSOURCES): add QParagraph,
QParagraphDialog, QDocument, QDocumentDialog
* Makefile.am (DISTCLEANFILES): delete
(EXTRA_DIST): add with Makefile.dialogs
2002-04-02 John Levon <moz@compsoc.man.ac.uk>
* ui/QParagraphDialog.ui: fix a couple of typos for

13
src/frontends/qt2/Makefile.am
View File

@ -1,9 +1,9 @@
include $(top_srcdir)/config/common.am
DISTCLEANFILES += $(BUILTSOURCES)
SUBDIRS = xforms ui moc
EXTRA_DIST = Makefile.dialogs
noinst_LTLIBRARIES = libqt2.la
INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
@ -13,14 +13,7 @@ INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
include Makefile.dialogs
#libqt2_la_LIBADD = \
# xforms/libqt2xforms.la \
# ui/libqt2ui.la \
# moc/libqt2moc.la \
# ui/moc/libqt2uimoc.la \
# @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
include $(srcdir)/Makefile.dialogs
libqt2_la_SOURCES = \
$(DIALOGSOURCES) \

4
src/frontends/qt2/Makefile.dialogs
View File

@ -40,6 +40,8 @@ DIALOGSOURCES = \
QCharacter.C QCharacterDialog.C \
QCitation.h QCitationDialog.h \
QCitation.C QCitationDialog.C \
QDocument.C QDocument.h \
QDocumentDialog.C QDocumentDialog.h \
QError.h QErrorDialog.h \
QError.C QErrorDialog.C \
QERT.h QERTDialog.h \
@ -58,6 +60,8 @@ DIALOGSOURCES = \
QLog.C QLogDialog.C \
QMinipage.h QMinipageDialog.h \
QMinipage.C QMinipageDialog.C \
QParagraph.C QParagraph.h \
QParagraphDialog.C QParagraphDialog.h \
QPreamble.h QPreambleDialog.h \
QPreamble.C QPreambleDialog.C \
QPrint.h QPrintDialog.h \

15
src/frontends/qt2/moc/Makefile.am
View File

@ -14,14 +14,15 @@ INCLUDES = -I$(top_srcdir)/src/ \
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
include ../Makefile.dialogs
include $(srcdir)/../Makefile.dialogs
libqt2moc_la_SOURCES = FileDialog_private_moc.C \
emptytable_moc.C \
lengthcombo_moc.C \
qttableview_moc.C \
Qt2Base_moc.C \
$(MOCDIALOGS)
#libqt2moc_la_SOURCES = FileDialog_private_moc.C \
# emptytable_moc.C \
# lengthcombo_moc.C \
# qttableview_moc.C \
# Qt2Base_moc.C
nodist_libqt2moc_la_SOURCES = $(MOCDIALOGS)
libqt2moc.la: $(libqt2moc_la_OBJECTS) $(libqt2moc_la_DEPENDENCIES)

4
src/frontends/qt2/ui/Makefile.am
View File

@ -12,11 +12,11 @@ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
SUBDIRS =. moc
include ../Makefile.dialogs
include $(srcdir)/../Makefile.dialogs
DISTCLEANFILES += $(UIDIALOGS)
libqt2ui_la_SOURCES = $(UIDIALOGS)
nodist_libqt2ui_la_SOURCES = $(UIDIALOGS)
libqt2ui.la: $(libqt2ui_la_OBJECTS) $(libqt2ui_la_DEPENDENCIES)

4
src/frontends/qt2/ui/moc/Makefile.am
View File

@ -13,9 +13,9 @@ INCLUDES = -I$(top_srcdir)/src/ \
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
include ../../Makefile.dialogs
include $(srcdir)/../../Makefile.dialogs
libqt2uimoc_la_SOURCES := $(UIMOCDIALOGS)
nodist_libqt2uimoc_la_SOURCES = $(UIMOCDIALOGS)
libqt2uimoc.la: $(libqt2uimoc_la_OBJECTS) $(libqt2uimoc_la_DEPENDENCIES)

4
src/frontends/qt2/xforms/Makefile.am
View File

@ -7,14 +7,12 @@ INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
EXTRA_DIST = xformsGImage.C xformsGImage.h
if USE_BASIC_IMAGE_LOADER
else
XFORMSGIMAGE = xformsGImage.C xformsGImage.h
endif
libqt2xforms_la_SOURCES = \
nodist_libqt2xforms_la_SOURCES = \
bmtable.h \
bmtable.c \
combox.h \

5
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* forms/Makefile.am (SUFFIXES): instead of .SUFFIXES
(updatesrc): delete wrong version
2002-04-06 Lars Gullik Bjønnes <larsbj@birdstep.com>
* forms/.cvsignore: add Makefile.in

6
src/frontends/xforms/forms/Makefile.am
View File

@ -1,7 +1,8 @@
include $(top_srcdir)/config/common.am
SHELL = /bin/sh
.SUFFIXES: .fd .c
SUFFIXES = .fd
SRCS = form_aboutlyx.fd \
form_bibitem.fd \
@ -65,6 +66,3 @@ clean-local:
distclean-local:
rm -f *.orig *.rej *~
updatesrc:
$(MAKE) -f makefile updatesrc